diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-07 16:15:27 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-07 16:15:27 -0600 |
| commit | 03072036937c250976f0522b070eefe96e8ab0f1 (patch) | |
| tree | 7ef17a8806369aa017ab7b0c0eaec8664403a408 /pkgs | |
| parent | 8e05911ccb73c28b3040cd0a1ef240e655a1e83c (diff) | |
mingw: use current package set for headers
gccCrossStageStatic should not need targetPackages.
Fixes #53587.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 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 a7d4f09b90e9..61a7fb149427 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -21,6 +21,6 @@ in stdenv.mkDerivation { patches = [ ./osvi.patch ]; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf85fa0a6ec..4469a62f98ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6790,7 +6790,7 @@ in # built with, and use, that cross-compiled libc. gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let libcCross1 = - if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers + if stdenv.targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode else null; binutils1 = wrapBintoolsWith { |