diff options
author | John Ericson <jericson@galois.com> | 2016-11-02 16:39:18 -0400 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-11-02 21:50:24 +0100 |
commit | a113382f2c8557ede623e392be6a294b8a6aa545 (patch) | |
tree | 035c8b7f735d175100e8388a7ef5ae37a5810a94 /pkgs/top-level/default.nix | |
parent | 64a3317889e18776ac6ad97a7723d795e10a94ed (diff) | |
download | nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar.gz nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar.bz2 nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar.lz nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar.xz nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.tar.zst nixpkgs-a113382f2c8557ede623e392be6a294b8a6aa545.zip |
top-level: Use `nixpkgsFun` to avoid import ../..
Diffstat (limited to 'pkgs/top-level/default.nix')
-rw-r--r-- | pkgs/top-level/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index c54b23853c5..7d370bec6b5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -24,13 +24,12 @@ , crossSystem ? null , platform ? null -}: +} @ args: let configExpr = config; platform_ = platform; in # rename the function arguments let - lib = import ../../lib; # Allow both: @@ -58,9 +57,20 @@ let else config.platform or platformAuto; topLevelArguments = { - inherit system bootStdenv noSysDirs config crossSystem platform lib; + inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; }; + # A few packages make a new package set to draw their dependencies from. + # (Currently to get a cross tool chain, or forced-i686 package.) Rather than + # give `all-packages.nix` all the arguments to this function, even ones that + # don't concern it, we give it this function to "re-call" nixpkgs, inheriting + # whatever arguments it doesn't explicitly provide. This way, + # `all-packages.nix` doesn't know more than it needs too. + # + # It's OK that `args` doesn't include the defaults: they'll be + # deterministically inferred the same way. + nixpkgsFun = newArgs: import ./. (args // newArgs); + stdenvAdapters = self: super: let res = import ../stdenv/adapters.nix self; in res // { stdenvAdapters = res; @@ -71,7 +81,7 @@ let inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }); - stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs; + stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs; allPackages = self: super: let res = import ./all-packages.nix topLevelArguments res self; |