diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-26 09:09:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 09:09:06 -0400 |
| commit | 761af147780c7dc68cbbfa93213cc73dd25f75ba (patch) | |
| tree | f37d657fdd86df1b73b60c7f0c2a3c5e7d63fa8f /pkgs/os-specific | |
| parent | aea92575816296a3a83ba1335b510c06f4a48f51 (diff) | |
| parent | 295315cc87acd13caa39ea87c1d8d010e7a587df (diff) | |
| download | nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar.gz nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar.bz2 nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar.lz nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar.xz nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.tar.zst nixlib-761af147780c7dc68cbbfa93213cc73dd25f75ba.zip | |
Merge pull request #25227 from obsidiansystems/cross-purge-binutilsCross
Purge binutilsCross
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/mingwrt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/w32api/default.nix | 4 |
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; |