summaryrefslogtreecommitdiffstats
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorDavid Grayson <davidegrayson@gmail.com>2016-12-21 18:42:53 -0800
committerJohn Ericson <Ericson2314@Yahoo.com>2017-01-13 13:23:25 -0500
commit0f33b9f7f11e414ff6213359ec2859199a68d550 (patch)
tree88a54d57b682476869d5be1d573106b0f6fa4a6c /pkgs/stdenv
parent3e197f7d81130defacfe5bdad71ca5ebe63324ff (diff)
top-level: Do stdenvOverrides in stage.nix even if crossSystem exists.
Instead, the cross stdenv will patch up the override field -- the complexity is now confined to the one place it matters.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/cross/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 728424c0a7af..359d45b78b96 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -24,6 +24,7 @@ in bootStages ++ [
stdenv = vanillaPackages.stdenv // {
# Needed elsewhere as a hacky way to pass the target
cross = crossSystem;
+ overrides = _: _: {};
};
})