-
-
Save bgamari/7f00faad98c90b22c22c52523ea4019f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix | |
index 7364a586fc2..546a1bc8934 100644 | |
--- a/pkgs/stdenv/booter.nix | |
+++ b/pkgs/stdenv/booter.nix | |
@@ -106,12 +106,16 @@ stageFuns: let | |
# This is a hack for resolving cross-compiled compilers' run-time | |
# deps. (That is, compilers that are themselves cross-compiled, as | |
# opposed to used to cross-compile packages.) | |
- postStage = buildPackages: { | |
- __raw = true; | |
- stdenv.cc = | |
- if buildPackages.stdenv.cc.isClang or false | |
- then buildPackages.clang | |
- else buildPackages.gcc; | |
+ postStage = buildPackages: allPackages { | |
+ allowCustomOverrides = false; | |
+ inherit buildPackages; | |
+ targetPackages = null; | |
+ stdenv = { | |
+ cc = | |
+ if buildPackages.stdenv.cc.isClang or false | |
+ then buildPackages.clang | |
+ else buildPackages.gcc; | |
+ }; | |
}; | |
in dfold folder postStage (_: {}) withAllowCustomOverrides |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment