b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add bootStdenv condition around the overrider.

Browse source 
This condition used to be implicit in the sense that the stdenvOverrides
uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of
the compiler is build again the bootstrap packages of the previous stage,
thus overriden by the stdenv.override function.
This commit is contained in:
Nicolas B. Pierron 2016-03-20 19:00:30 +00:00
parent 598ed874df
commit 9e8c5208a1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/top-level/default.nix
View file

@ -130,6 +130,9 @@ let
aliases = self: super: import ./aliases.nix super;
customOverrides = self: super:
lib.optionalAttrs (bootStdenv == null) (overrider self super);
pkgs_1 = {};
pkgs_2 = pkgs_1 // stdenvAdapters pkgs pkgs_1;
pkgs_3 = pkgs_2 // trivialBuilders pkgs pkgs_2;
@ -137,7 +140,7 @@ let
pkgs_5 = pkgs_4 // allPackages pkgs pkgs_4;
pkgs_6 = pkgs_5 // aliases pkgs pkgs_5;
pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;
pkgs_7 = pkgs_6 // customOverrides pkgs pkgs_6;
# The overriden, final packages.
pkgs = pkgs_7 // stdenvOverrides pkgs pkgs_6;