pyrox.dev
lol
luajit_2_1: 2.1.0-2021-08-12 -> 2.1.0-2021-10-27
+3
-21
+3
-3
pkgs/development/interpreters/luajit/2.1.nix
+3
-3
pkgs/development/interpreters/luajit/2.1.nix
···
1
1
{ self, callPackage }:
2
2
callPackage ./default.nix {
3
3
inherit self;
4
-
version = "2.1.0-2021-08-12";
5
-
rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597";
4
+
version = "2.1.0-2021-10-27";
5
+
rev = "b4b2dce9fc3ffaaaede39b36d06415311e2aa516";
6
6
isStable = false;
7
-
sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr";
7
+
sha256 = "185s071aa0yffz8npgdxj7l98cs987vddb2l5pzfcdqfj41gn55q";
8
8
}
-14
pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch
-14
pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch
···
1
-
diff --git a/src/Makefile b/src/Makefile
2
-
index 2538503f..7e6380da 100644
3
-
--- a/src/Makefile
4
-
+++ b/src/Makefile
5
-
@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS))
6
-
$(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
7
-
endif
8
-
TARGET_STRIP+= -x
9
-
+ ifneq (arm64,$(shell uname -m))
10
-
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
11
-
+ endif
12
-
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
13
-
TARGET_DYNXLDOPTS=
14
-
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
-4
pkgs/development/interpreters/luajit/default.nix
-4
pkgs/development/interpreters/luajit/default.nix
···
51
51
52
52
luaversion = "5.1";
53
53
54
-
# Fix for pcall on aarch64-darwin.
55
-
# Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698
56
-
patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ];
57
-
58
54
postPatch = ''
59
55
substituteInPlace Makefile --replace ldconfig :
60
56
if test -n "''${dontStrip-}"; then