From 49c99b70cf64ccf99cd292426b3dbcaeb2e885aa Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2017 18:15:12 -0500 Subject: 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. --- pkgs/stdenv/cross/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/stdenv/cross') diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 05910d100a8..dec4b036092 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -21,9 +21,7 @@ in bootStages ++ [ selfBuild = false; # It's OK to change the built-time dependencies allowCustomOverrides = true; - stdenv = vanillaPackages.stdenv // { - overrides = _: _: {}; - }; + inherit (vanillaPackages) stdenv; }) # Run Packages -- cgit 1.4.1