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

luarocks: 3.0.4 -> 3.1.3

Browse Source 
The newer version silences some superfluous warnings we were previously
getting in Nix builds using luarocks.
This commit is contained in:
Alexei Robyn
2019-06-13 20:52:34 +10:00
parent 2792dc8a0a
commit f8efece8e7
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
+24
View File
@@ -0,0 +1,24 @@
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index c5af5a2..1949fdc 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -425,7 +425,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
defaults.external_lib_extension = "dylib"
defaults.arch = "macosx-"..target_cpu
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
- local version = util.popen_read("sw_vers -productVersion")
+ local version = "10.10"
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
if version >= 10 then
version = 8
@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
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