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

lua-5: isMingw -> isMinGW

Browse Source
This commit is contained in:
Will Dietz
2018-01-09 11:23:56 -05:00
committed by John Ericson
parent 7c992cb7af
commit 681555c11c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/lua-5/5.2.nix
+3 -3
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = let crossAttrs = let
inherit (hostPlatform) isDarwin isMingw; inherit (hostPlatform) isDarwin isMinGW;
in { in {
configurePhase = '' configurePhase = ''
makeFlagsArray=( makeFlagsArray=(
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
INSTALL_MAN=$out/share/man/man1 INSTALL_MAN=$out/share/man/man1
V=${luaversion} V=${luaversion}
R=${version} R=${version}
${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin ''
''} ''}
) )
'' + stdenv.lib.optionalString isMingw '' '' + stdenv.lib.optionalString isMinGW ''
installFlagsArray=( installFlagsArray=(
TO_BIN="lua.exe luac.exe" TO_BIN="lua.exe luac.exe"
TO_LIB="liblua.a lua52.dll" TO_LIB="liblua.a lua52.dll"
pkgs/development/interpreters/lua-5/5.3.nix
+3 -3
View File
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = let crossAttrs = let
inherit (hostPlatform) isDarwin isMingw; inherit (hostPlatform) isDarwin isMinGW;
in { in {
configurePhase = '' configurePhase = ''
makeFlagsArray=( makeFlagsArray=(
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
INSTALL_MAN=$out/share/man/man1 INSTALL_MAN=$out/share/man/man1
V=${luaversion} V=${luaversion}
R=${version} R=${version}
${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin ''
''} ''}
) )
'' + stdenv.lib.optionalString isMingw '' '' + stdenv.lib.optionalString isMinGW ''
installFlagsArray=( installFlagsArray=(
TO_BIN="lua.exe luac.exe" TO_BIN="lua.exe luac.exe"
TO_LIB="liblua.a lua52.dll" TO_LIB="liblua.a lua52.dll"