diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-11-27 12:37:45 -0800 |
|---|---|---|
| committer | John Ericson <jericson@galois.com> | 2016-11-30 19:11:03 -0500 |
| commit | 39753f5360134f1aab1a949260374a876c0983eb (patch) | |
| tree | 02dc06e81131d21218526443b19b96773a75896d /pkgs/top-level/default.nix | |
| parent | d240a0da1ab03ef8838553229b72b9b37a0ef3e7 (diff) | |
| download | nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar.gz nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar.bz2 nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar.lz nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar.xz nixlib-39753f5360134f1aab1a949260374a876c0983eb.tar.zst nixlib-39753f5360134f1aab1a949260374a876c0983eb.zip | |
top-level: Close over fewer arguments for stdenv stages
This makes the flow of data easier to understand. There's little downside because the args in question are already inspected by the stdenvs. cross-compiling in particular is simpler because we don't need to worry about overriding the config closed over by `allPackages`.
Diffstat (limited to 'pkgs/top-level/default.nix')
| -rw-r--r-- | pkgs/top-level/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index d1e824a8070b..9464a8012b31 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -69,9 +69,10 @@ in let # deterministically inferred the same way. nixpkgsFun = newArgs: import ./. (args // newArgs); - # Partially apply some args for building bootstraping stage pkgs sets + # Partially apply some arguments for building bootstraping stage pkgs + # sets. Only apply arguments which no stdenv would want to override. allPackages = newArgs: import ./stage.nix ({ - inherit lib nixpkgsFun config; + inherit lib nixpkgsFun; } // newArgs); stdenv = import ../stdenv { |