JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53605 from matthewbauer/fix-53587

Browse Source 
mingw: use current package set for headers
This commit is contained in:
Matthew Bauer 2019-01-13 20:12:44 -05:00 committed by GitHub
commit 2000d62a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/windows/mingw-w64/default.nix
View File

@ -21,6 +21,6 @@ in stdenv.mkDerivation {
patches = [ ./osvi.patch ];
meta = {
platforms = stdenv.lib.platforms.windows;
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -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 {