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

mingw: use current package set for headers

Browse Source 
gccCrossStageStatic should not need targetPackages.

Fixes #53587.
This commit is contained in:
Matthew Bauer 2019-01-07 16:15:27 -06:00
parent 8e05911ccb
commit 0307203693
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

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