summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-4.x
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-03-03 22:31:18 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-03-03 22:38:48 +0100
commite64b342fa8fda783a7247e0469943ce728498004 (patch)
tree567a9c73e4fbb2137f9c714848d11287db7692b3 /pkgs/development/libraries/qt-4.x
parentae0b5d6813362492e744b1ac10e21309bb4e238b (diff)
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>
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
-rw-r--r--pkgs/development/libraries/qt-4.x/4.8/default.nix3
1 files changed, 1 insertions, 2 deletions
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