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

3 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index a9df0d29e09f..49612b0b4618 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;
 
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 286c63d01637..98461d690d92 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}:
 
 let
   name = "mingwrt-3.20";
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;
 
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 2a5af71b5eca..3443fff9668d 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz, binutilsCross ? null
+{ stdenv, fetchurl, xz, binutils ? null
 , gccCross ? null, onlyHeaders ? false }:
 
 let
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
     cp -R include $out
   '';
 } else {
-  buildInputs = [ gccCross binutilsCross ];
+  buildInputs = [ gccCross binutils ];
 
   crossConfig = gccCross.crossConfig;