diff options
author | Alexei Robyn <shados@shados.net> | 2019-06-13 20:03:25 +1000 |
---|---|---|
committer | Alexei Robyn <shados@shados.net> | 2019-06-13 20:03:25 +1000 |
commit | 00622f144e01b3afb88a572d87f4d8f6afc4a5af (patch) | |
tree | 50ee946dc18d9f41cca185a222fc5075dce2cf7a /pkgs/development/tools/misc | |
parent | 46c6b27633637bde724ffddd2bc3c68447bf1fa6 (diff) | |
download | nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar.gz nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar.bz2 nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar.lz nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar.xz nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.tar.zst nixlib-00622f144e01b3afb88a572d87f4d8f6afc4a5af.zip |
luarocks-nix: Bump to version that supports --maintainers argument
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch | 27 | ||||
-rw-r--r-- | pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 7 |
2 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch new file mode 100644 index 000000000000..a5e4ac461b48 --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -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 + diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index d9f481425b62..8da224f0ef8c 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -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 + ]; }) |