Revert "mingw: use current package set for headers"

This reverts commit 0307203693.
wip/yesman
Matthew Bauer 5 years ago
parent 9fd1c170cc
commit febda2b127
  1. 2
      pkgs/os-specific/windows/mingw-w64/default.nix
  2. 2
      pkgs/top-level/all-packages.nix

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

@ -6762,7 +6762,7 @@ in
# built with, and use, that cross-compiled libc.
gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let
libcCross1 =
if stdenv.targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers
if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers
else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode
else null;
binutils1 = wrapBintoolsWith {

Loading…
Cancel
Save