Merge pull request #55580 from LnL7/darwin-luarocks
luarocks: patch sw_vers and gcc
This commit is contained in:
commit
5b0e7de0bd
27
pkgs/development/tools/misc/luarocks/darwin.patch
Normal file
27
pkgs/development/tools/misc/luarocks/darwin.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
|
||||||
|
index 55cd4c9..060a6f1 100644
|
||||||
|
--- a/src/luarocks/cfg.lua
|
||||||
|
+++ b/src/luarocks/cfg.lua
|
||||||
|
@@ -587,9 +587,9 @@ if cfg.platforms.macosx then
|
||||||
|
defaults.external_lib_extension = "dylib"
|
||||||
|
defaults.arch = "macosx-"..cfg.target_cpu
|
||||||
|
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
|
||||||
|
- defaults.variables.STAT = "/usr/bin/stat"
|
||||||
|
+ defaults.variables.STAT = "stat"
|
||||||
|
defaults.variables.STATFLAG = "-f '%A'"
|
||||||
|
- local version = io.popen("sw_vers -productVersion"):read("*l")
|
||||||
|
+ local version = "10.10"
|
||||||
|
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
|
||||||
|
if version >= 10 then
|
||||||
|
version = 8
|
||||||
|
@@ -598,8 +598,8 @@ if cfg.platforms.macosx then
|
||||||
|
else
|
||||||
|
defaults.gcc_rpath = false
|
||||||
|
end
|
||||||
|
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
|
||||||
|
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." gcc"
|
||||||
|
+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
|
||||||
|
+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET=10."..version.." clang"
|
||||||
|
defaults.web_browser = "open"
|
||||||
|
end
|
||||||
|
|
@ -6,6 +6,7 @@
|
|||||||
# some packages need to be compiled with cmake
|
# some packages need to be compiled with cmake
|
||||||
, cmake
|
, cmake
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
s = # Generated upstream information
|
s = # Generated upstream information
|
||||||
rec {
|
rec {
|
||||||
@ -20,12 +21,14 @@ let
|
|||||||
lua curl makeWrapper which unzip
|
lua curl makeWrapper which unzip
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit (s) name version;
|
inherit (s) name version;
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
inherit (s) url sha256;
|
inherit (s) url sha256;
|
||||||
};
|
};
|
||||||
|
patches = [ ./darwin.patch ];
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
lua -e "" || {
|
lua -e "" || {
|
||||||
luajit -e "" && {
|
luajit -e "" && {
|
||||||
@ -47,7 +50,6 @@ stdenv.mkDerivation {
|
|||||||
--suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
|
--suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
|
||||||
--suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
|
--suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
|
||||||
--suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua"
|
--suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua"
|
||||||
|
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
@ -6,15 +6,11 @@ _tryRockSpec() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_trySourceRock() {
|
_trySourceRock() {
|
||||||
|
|
||||||
if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi
|
if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi
|
||||||
|
|
||||||
export PATH=${unzip}/bin:$PATH
|
|
||||||
|
|
||||||
# luarocks expects a clean <name>.rock.spec name to be the package name
|
# luarocks expects a clean <name>.rock.spec name to be the package name
|
||||||
# so we have to strip the hash
|
# so we have to strip the hash
|
||||||
renamed="$(stripHash $curSrc)"
|
renamed="$(stripHash $curSrc)"
|
||||||
cp "$curSrc" "$renamed"
|
cp "$curSrc" "$renamed"
|
||||||
luarocks unpack --force "$renamed"
|
luarocks unpack --force "$renamed"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user