cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch

25 lines
1.2 KiB
Diff
Raw Normal View History

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
2019-03-07 08:58:06 +01:00
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
luarocks: 3.0.4 -> 3.1.3 The newer version silences some superfluous warnings we were previously getting in Nix builds using luarocks.
2019-06-13 12:52:34 +02:00
index c5af5a2..1949fdc 100644
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
2019-03-07 08:58:06 +01:00
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
luarocks: 3.0.4 -> 3.1.3 The newer version silences some superfluous warnings we were previously getting in Nix builds using luarocks.
2019-06-13 12:52:34 +02:00
@@ -425,7 +425,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
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
2019-03-07 08:58:06 +01:00
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")
luarocks: Update detected platform version Now that our MACOSX_DEPLOYMENT_TARGET is set to 10.12, we shouldn't be hardcoding the platform at build time as 10.10. This change makes it inherit the MACOSX_DEPLOYMENT_TARGET value.
2019-08-15 01:16:31 +02:00
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
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
2019-03-07 08:58:06 +01:00
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
if version >= 10 then
version = 8
luarocks: 3.0.4 -> 3.1.3 The newer version silences some superfluous warnings we were previously getting in Nix builds using luarocks.
2019-06-13 12:52:34 +02:00
@@ -434,8 +434,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
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
2019-03-07 08:58:06 +01:00
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"
luarocks: patch sw_vers and gcc on darwin The sw_vers binary is not part of the stdenv and it would make builds impure based on what macOS version they where built on.
2019-02-11 21:10:30 +01:00
end
Reference in a new issue Copy permalink