Use mingw-w64 for 32bit Windows builds as well.

Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

4 files changed, 4 insertions, 5 deletions

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 0df130b11fb1a..56ac04bebe627 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     configureFlags = configureFlagsFun {
-      alsaSupport = stdenv.cross.config != "x86_64-w64-mingw32";
+      alsaSupport = stdenv.cross.libc != "msvcrt";
       alsaLib = alsaLib.crossDrv;
     } + "--disable-directx";
   };
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index b79fa97047b97..32083f96dfd1b 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cross.config}-gcc"
     "LD=${stdenv.cross.config}-gcc"
     "STRIP="
-  ] ++ optional (stdenv.cross.config == "x86_64-w64-mingw32") "SYSTEM=mingw";
+  ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw";
 
   meta = {
     description = "An OpenGL extension loading library for C(++)";
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 067c3af43871d..7138c44da643a 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra
 
-  crossAttrs = optionalAttrs (stdenv.cross.config == "x86_64-w64-mingw32") {
+  crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") {
     buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
   };
 
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 16bd1ee65d2e1..1bd027f52986e 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -148,8 +148,7 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingw = stdenv.cross.config == "i686-pc-mingw32" ||
-      stdenv.cross.config == "x86_64-w64-mingw32";
+    isMingw = stdenv.cross.libc == "msvcrt";
   in {
     # I've not tried any case other than i686-pc-mingw32.
     # -nomake tools:   it fails linking some asian language symbols