Add bootStdenv condition around the overrider.

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.

1 files changed, 4 insertions, 1 deletions

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index f1082226d76c..b641d54a5ae7 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -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;