diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-13 20:12:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 20:12:44 -0500 |
| commit | 2000d62a504bbe2575bc3aa5c73948e13922952f (patch) | |
| tree | 4b8597d362ea4bc97ae2b58e0fad8cd4f47b6caa | |
| parent | 52d7d5efedd48d72e2d2abc919f1a14761ae98aa (diff) | |
| parent | 03072036937c250976f0522b070eefe96e8ab0f1 (diff) | |
| download | nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar.gz nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar.bz2 nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar.lz nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar.xz nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.tar.zst nixpkgs-2000d62a504bbe2575bc3aa5c73948e13922952f.zip | |
Merge pull request #53605 from matthewbauer/fix-53587
mingw: use current package set for headers
| -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 a7d4f09b90e..61a7fb14942 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 527c52bc145..3ca24a99c18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6815,7 +6815,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 { |