summary refs log tree commit diff
path: root/pkgs/development/interpreters/lua-5
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/interpreters/lua-5
parentae0b5d6813362492e744b1ac10e21309bb4e238b (diff)
downloadnixlib-e64b342fa8fda783a7247e0469943ce728498004.tar
nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.gz
nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.bz2
nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.lz
nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.xz
nixlib-e64b342fa8fda783a7247e0469943ce728498004.tar.zst
nixlib-e64b342fa8fda783a7247e0469943ce728498004.zip
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/interpreters/lua-5')
-rw-r--r--pkgs/development/interpreters/lua-5/5.2.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 609c6b3e404a..b8fcbe5f242a 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingwW64 = stdenv.cross.config == "x86_64-w64-mingw32";
+    isMingw = stdenv.cross.libc == "msvcrt";
   in {
     configurePhase = ''
       makeFlagsArray=(
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
         RANLIB=${stdenv.cross.config}-ranlib
         V=${majorVersion}
         R=${version}
-        ${stdenv.lib.optionals isMingwW64 "mingw"}
+        ${stdenv.lib.optionals isMingw "mingw"}
       )
-    '' + stdenv.lib.optionalString isMingwW64 ''
+    '' + stdenv.lib.optionalString isMingw ''
       installFlagsArray=(
         TO_BIN="lua.exe luac.exe"
         TO_LIB="liblua.a lua52.dll"