public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split helperFunctions to simplify the identification with the extend function.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 17:37:40 +00:00
parent 5cdaa7b907
commit ff72cf185e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/default.nix
View File

@ -113,14 +113,12 @@ let
# function is very expensive! # function is very expensive!
pkgsWithOverrides = overrider: pkgsWithOverrides = overrider:
let 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 = stdenvAdapters =
import ../stdenv/adapters.nix pkgs; 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; stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs;
selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; }; selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; };
@ -128,7 +126,8 @@ let
aliases = import ./aliases.nix self; aliases = import ./aliases.nix self;
pkgs_3 = helperFunctions; pkgs_2 = stdenvAdapters;
pkgs_3 = pkgs_2 // trivialBuilders;
pkgs_4 = pkgs_3 // stdenvDefault; pkgs_4 = pkgs_3 // stdenvDefault;
pkgs_5 = pkgs_4 // self; pkgs_5 = pkgs_4 // self;
pkgs_6 = pkgs_5 // aliases; pkgs_6 = pkgs_5 // aliases;