Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

outputs: allow string interpolation

Browse source
This commit is contained in:
Wroclaw 2024-07-07 08:34:47 +02:00
parent ccae4f8ef4
commit d5b5519f4f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -47,5 +47,5 @@ let
type != "unknown" && builtins.baseNameOf path != ".git" && !matchesGitIgnore path type != "unknown" && builtins.baseNameOf path != ".git" && !matchesGitIgnore path
) ./.; ) ./.;
in in
if !(evaluatingInStore) then import selfInStore if !(evaluatingInStore) then { ... }@args: import selfInStore ({ selfPath = selfInStore; } // args )
else import ./outputs.nix else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args)

10
outputs.nix
View file

@ -1,4 +1,7 @@
{ inputs ? import ./inputs.nix {} }: {
inputs ? import ./inputs.nix {},
selfPath ? ./.
}:
let let
@ -6,6 +9,7 @@ lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib/overlays/version-inf
self = { self = {
inherit inputs lib self; inherit inputs lib self;
__toString = _: selfPath;
modifiedNixpkgs = import ./pkgs/top-level/impure.nix; modifiedNixpkgs = import ./pkgs/top-level/impure.nix;
modifiedNixpkgsPure = import ./pkgs/top-level/default.nix; modifiedNixpkgsPure = import ./pkgs/top-level/default.nix;
overlays = { overlays = {
@ -40,8 +44,8 @@ self = {
./hosts/${name} ./hosts/${name}
{ {
config.nixpkgs.overlays = [ config.nixpkgs.overlays = [
( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } ) ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${self}/pkgs/top-level/impure.nix"; } )
( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${builtins.toString ./.}/pkgs/by-name" ) ( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${self}/pkgs/by-name" )
self.overlays.versionInfoFixup self.overlays.versionInfoFixup
]; ];
} }