stdenv boot: Hack to allow skipping a stage

We need this ugliness for cross-building until we can boot GCC. See NixOS#26004 for progress on that.
Ericson2314 · Jul 6, 2017 · 00a21d7 · 00a21d7
1 parent 730a394
commit 00a21d7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
@@ -96,8 +96,11 @@ stageFuns: let
   in
     if args.__raw or false
     then args'
-    else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // {
-      buildPackages = if args.selfBuild or true then null else prevStage;
+    else allPackages ((builtins.removeAttrs args' [ "selfBuild" "skipPrev" ]) // {
+      buildPackages =
+        /**/ if args.selfBuild or true then null
+        else if args.skipPrev or false then prevStage.stdenv.__bootPackages
+        else                                prevStage;
       __targetPackages = if args.selfBuild or true then null else nextStage;
     });