diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
| commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
| tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/development/tools/misc/luarocks | |
| parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
| parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
| download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip | |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/luarocks')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch index a5e4ac461b48..013ac5180afa 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch +++ b/nixpkgs/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/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 7ef1c7a319ca..4ba883f01130 100644 --- a/nixpkgs/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/nixpkgs/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 |