Skip to content

Commit

Permalink
Revert "luarocks: 3.2.1 -> 3.7.0"
Browse files Browse the repository at this point in the history
This reverts commit eec90bc.

See discussion in:
  NixOS#141718
  NixOS#80528
  • Loading branch information
7c6f434c committed Oct 16, 2021
1 parent fd435dc commit 5c93a77
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
24 changes: 24 additions & 0 deletions pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index c5af5a2..1949fdc 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -425,7 +425,7 @@ 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"
- local version = util.popen_read("sw_vers -productVersion")
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@"
version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
if version >= 10 then
version = 8
@@ -434,8 +434,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

24 changes: 0 additions & 24 deletions pkgs/development/tools/misc/luarocks/darwin-3.7.0.patch

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/luarocks/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

stdenv.mkDerivation rec {
pname = "luarocks";
version = "3.7.0";
version = "3.2.1";

src = fetchFromGitHub {
owner = "luarocks";
repo = "luarocks";
rev = "v${version}";
sha256 = "1sn2j7hv8nbdjqj1747glk9770zw8q5v8ivaxhvwbk3vl038ck9d";
sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
};

patches = [ ./darwin-3.7.0.patch ];
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}'
Expand Down

0 comments on commit 5c93a77

Please sign in to comment.