diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-02-05 15:51:12 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2021-04-11 09:47:10 +0900 |
| commit | 2316ada93f48a94f0dd7d2cc7dc5592b3f336a70 (patch) | |
| tree | 2c2fdd8ebd139447f7964efe69ae85f82941281e /pkgs/development/tools/misc/luarocks | |
| parent | 6605fadc687b2e3f3f3d611556ba36ff30eaf612 (diff) | |
luarocks: use targetPlatform.darwinMinVersion as default
Diffstat (limited to 'pkgs/development/tools/misc/luarocks')
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/default.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 4ba883f011301..8070af173aaf7 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 77f34cca7dec1..d4f2ec4ded983 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { }; patches = [ ./darwin-3.1.3.patch ]; + + postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' + substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' + ''; + preConfigure = '' lua -e "" || { luajit -e "" && { |