diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-11 18:15:12 -0500 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-24 16:31:53 -0400 |
commit | 49c99b70cf64ccf99cd292426b3dbcaeb2e885aa (patch) | |
tree | dad93fe2a6b15c37cbadf9a378522c8a89bf00b2 /pkgs/stdenv/darwin | |
parent | a7068ace35c5344fc2760733d32cca8fd4f01116 (diff) | |
download | nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar.gz nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar.bz2 nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar.lz nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar.xz nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.tar.zst nixpkgs-49c99b70cf64ccf99cd292426b3dbcaeb2e885aa.zip |
cross-stdenv: Only prune most overrides in the final stage
Before all overrides were also pruned in the previous stage, now only gcc and binutils are, because they alone care about about the target platform. The rest of the overrides don't, so it's better to preserve them in order to avoid spurious rebuilds.
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index e80c54e0218..8a517fddad8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -253,7 +253,7 @@ in rec { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep - coreutils findutils diffutils patchutils binutils binutils-raw; + coreutils findutils diffutils patchutils; llvmPackages = super.llvmPackages // { inherit (llvmPackages) llvm clang-unwrapped; @@ -262,6 +262,9 @@ in rec { darwin = super.darwin // { inherit (darwin) dyld Libsystem cctools libiconv; }; + } // lib.optionalAttrs (super.targetPlatform == localSystem) { + # Need to get rid of these when cross-compiling. + inherit binutils binutils-raw; }; stdenvDarwin = prevStage: let pkgs = prevStage; in import ../generic rec { |