diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 17:37:40 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 17:37:40 +0000 |
| commit | ff72cf185e0f0b5eaa5691f31574d16563a703d0 (patch) | |
| tree | 7659d0099cbd0b05802aedb9a06e7a7450c8b663 /pkgs/top-level/default.nix | |
| parent | 5cdaa7b90766f69e8fee9eb2a2ce1cbb1c22624a (diff) | |
| download | nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar.gz nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar.bz2 nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar.lz nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar.xz nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.tar.zst nixlib-ff72cf185e0f0b5eaa5691f31574d16563a703d0.zip | |
Split helperFunctions to simplify the identification with the extend function.
Diffstat (limited to 'pkgs/top-level/default.nix')
| -rw-r--r-- | pkgs/top-level/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 8b499b96215d..58b2a75f0d25 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -113,14 +113,12 @@ let # function is very expensive! pkgsWithOverrides = overrider: let - # Helper functions that are exported through `pkgs'. - helperFunctions = - stdenvAdapters // - (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); - stdenvAdapters = import ../stdenv/adapters.nix pkgs; + trivialBuilders = + (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); + stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; }; @@ -128,7 +126,8 @@ let aliases = import ./aliases.nix self; - pkgs_3 = helperFunctions; + pkgs_2 = stdenvAdapters; + pkgs_3 = pkgs_2 // trivialBuilders; pkgs_4 = pkgs_3 // stdenvDefault; pkgs_5 = pkgs_4 // self; pkgs_6 = pkgs_5 // aliases; |