diff --git a/default.nix b/default.nix index 0c9248a..3ce80ff 100644 --- a/default.nix +++ b/default.nix @@ -47,5 +47,5 @@ let type != "unknown" && builtins.baseNameOf path != ".git" && !matchesGitIgnore path ) ./.; in -if !(evaluatingInStore) then { ... }@args: import selfInStore ({ selfPath = selfInStore; } // args ) -else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args) +if !(evaluatingInStore) then import selfInStore +else import ./outputs.nix diff --git a/outputs.nix b/outputs.nix index 6793c9d..ad24442 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,15 +1,11 @@ -{ - inputs ? import ./inputs.nix {}, - selfPath ? ./. -}: +{ inputs ? import ./inputs.nix {} }: let lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib/overlays/version-info-fixup.nix { inherit inputs; }); self = { - inherit inputs lib self; - __toString = _: selfPath; + inherit lib inputs; modifiedNixpkgs = import ./pkgs/top-level/impure.nix; modifiedNixpkgsPure = import ./pkgs/top-level/default.nix; overlays = { @@ -44,8 +40,8 @@ self = { ./hosts/${name} { config.nixpkgs.overlays = [ - ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${self}/pkgs/top-level/impure.nix"; } ) - ( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${self}/pkgs/by-name" ) + ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } ) + ( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${builtins.toString ./.}/pkgs/by-name" ) self.overlays.versionInfoFixup ]; }