diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 21:18:29 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 21:36:19 -0400 |
commit | 295315cc87acd13caa39ea87c1d8d010e7a587df (patch) | |
tree | 3b172dc6ccb3e081ffe2c27001beb868486ef0f8 /pkgs/stdenv | |
parent | 85b4d30c0b464f6431eac6c50687111cfc69eb22 (diff) | |
download | nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.gz nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.bz2 nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.lz nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.xz nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.tar.zst nixpkgs-295315cc87acd13caa39ea87c1d8d010e7a587df.zip |
binutilsCross: Remove and use `binutils` instead always
See previous commit for what was done to `binutils` to make this possible. There were some uses of `forcedNativePackages` added. The combination of overrides with that attribute is highly spooky: it's often important that if an overridden package comes from it, the replaced arguments for that package come from it. Long term this package set and all the spookiness should be gone and irrelevant: "Move along, nothing to see here!" No hashes should be changed with this commit
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 65a0bf98456..7eab7ddb072 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -56,7 +56,7 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. - makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // { + makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // { # Overrides are surely not valid as packages built with this run on a # different platform. @@ -91,7 +91,7 @@ rec { name = name + "-" + cross.config; nativeBuildInputs = nativeBuildInputs ++ nativeInputsFromBuildInputs - ++ [ gccCross binutilsCross ] + ++ [ gccCross binutils ] ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs @@ -110,7 +110,7 @@ rec { crossConfig = cross.config; } // args.crossAttrs or {}); - inherit gccCross binutilsCross; + inherit gccCross binutils; ccCross = gccCross; }; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index dec4b036092..7fe56725170 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -39,7 +39,7 @@ in bootStages ++ [ binutils cc else buildPackages.makeStdenvCross buildPackages.stdenv crossSystem - buildPackages.binutilsCross buildPackages.gccCrossStageFinal; + buildPackages.binutils buildPackages.gccCrossStageFinal; }) ] |