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

luarocks-nix: Bump to version that supports --maintainers argument

Browse Source
This commit is contained in:
Alexei Robyn 2019-06-13 20:03:25 +10:00
parent 46c6b27633
commit 00622f144e
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index f93e67a..2eb2db9 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -425,9 +425,9 @@ 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"
- defaults.variables.STAT = "/usr/bin/stat"
+ defaults.variables.STAT = "stat"
defaults.variables.STATFLAG = "-f '%A'"
- 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
@@ -436,8 +436,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

7
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
View File

@ -4,7 +4,10 @@ luarocks.overrideAttrs(old: {
src = fetchFromGitHub {
owner = "teto";
repo = "luarocks";
rev = "595456f1246d66e5bdce0de838d0d6188274991c";
sha256 = "14nn0n5a0m516lnbwljy85h7y98zwnfbcyz7hgsm6fn4p8316yz2";
rev = "38ed82ba3e5682d7d55ef9a870dfb464ca180df9";
sha256 = "0vlzywiv3sxkpjg1fzzxicmfr6kh04fxw5q9n8vsd2075xjxg6bs";
};
patches = [
./darwin-3.0.x.patch
];
})