diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-03-07 16:58:06 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-03-07 17:43:07 +0900 |
| commit | c37b8925ba6d1b23a892f99b8634c5b5f51f1688 (patch) | |
| tree | cfad87cbebb312ea8cc645955845c0de66b4ad45 /pkgs/development/tools/misc/luarocks/darwin.patch | |
| parent | 992364d34e512712995b4b9b7360e2098d27b335 (diff) | |
| download | nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar.gz nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar.bz2 nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar.lz nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar.xz nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.tar.zst nixpkgs-c37b8925ba6d1b23a892f99b8634c5b5f51f1688.zip | |
luarocks: 2.4.4 -> 3.0.4
Some new features like test_dependencies/build_dependencies and flags ( --lua-versions) that should make nix integration easier: https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md
Diffstat (limited to 'pkgs/development/tools/misc/luarocks/darwin.patch')
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/development/tools/misc/luarocks/darwin.patch b/pkgs/development/tools/misc/luarocks/darwin.patch index ec7f924987a..a5e4ac461b4 100644 --- a/pkgs/development/tools/misc/luarocks/darwin.patch +++ b/pkgs/development/tools/misc/luarocks/darwin.patch @@ -1,27 +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 +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 -- 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 |