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/os-specific/windows/mingw-w64/default.nix | |
parent | 85b4d30c0b464f6431eac6c50687111cfc69eb22 (diff) |
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/os-specific/windows/mingw-w64/default.nix')
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index a9df0d29e09f9..49612b0b4618e 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null +{ stdenv, fetchurl, binutils ? null, gccCross ? null , onlyHeaders ? false , onlyPthreads ? false }: @@ -27,7 +27,7 @@ stdenv.mkDerivation ({ cd mingw-w64-libraries/winpthreads ''; } else { - buildInputs = [ gccCross binutilsCross ]; + buildInputs = [ gccCross binutils ]; crossConfig = gccCross.crossConfig; |