diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-04-27 09:09:27 -0700 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2016-11-06 21:28:38 -0800 |
| commit | 6bfe04277f40a0da27fa6373edfb24a6b139548b (patch) | |
| tree | 222265464db294577bc8ea56b7a3c99c2847d6be /pkgs/stdenv/cross | |
| parent | ea7bf0226825e21555eda1fd57d93762b376188d (diff) | |
| download | nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar.gz nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar.bz2 nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar.lz nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar.xz nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.tar.zst nixlib-6bfe04277f40a0da27fa6373edfb24a6b139548b.zip | |
top-level: Make config-overriden stdenv bootstrap more normally
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d78061db712e..93c5a21d9d5a 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,9 +1,13 @@ { system, allPackages, platform, crossSystem, config, ... } @ args: rec { - vanillaStdenv = (import ../. (args // { + argClobber = { crossSystem = null; - allPackages = args: allPackages ({ crossSystem = null; } // args); + # Ignore custom stdenvs when cross compiling for compatability + config = builtins.removeAttrs config [ "replaceStdenv" ]; + }; + vanillaStdenv = (import ../. (args // argClobber // { + allPackages = args: allPackages (argClobber // args); })).stdenv; # Yeah this isn't so cleanly just build-time packages yet. Notice the |