diff options
| author | Lily Ballard <lily@sb.org> | 2019-08-14 16:16:31 -0700 |
|---|---|---|
| committer | Matthieu Coudron <coudron@iij.ad.jp> | 2019-08-15 23:10:10 +0900 |
| commit | 45e62536780ea3b90f0db4473f1e53f78f0c5a6a (patch) | |
| tree | f3081af617d09eb47fa0b90127d46ed0c53a958d /pkgs/development/tools/misc/luarocks | |
| parent | c22351d25e72e0add43c43b3380bef6dff3e4e7e (diff) | |
| download | nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar.gz nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar.bz2 nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar.lz nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar.xz nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.tar.zst nixpkgs-45e62536780ea3b90f0db4473f1e53f78f0c5a6a.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/misc/luarocks')
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch | 2 |
2 files changed, 2 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 index a5e4ac461b4..013ac5180af 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch @@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644 + defaults.variables.STAT = "stat" defaults.variables.STATFLAG = "-f '%A'" - local version = util.popen_read("sw_vers -productVersion") -+ local version = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 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 7ef1c7a319c..4ba883f0113 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 = "10.10" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 |