Skip to content

Commit 87f3ad9

Browse files
committed
use latest luajit
1 parent d9c0845 commit 87f3ad9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

flake.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
name = "luajit";
2020
src = pkgs.fetchgit {
2121
url = "https://github.com/LuaJIT/LuaJIT.git";
22-
rev = "e17ee83326f73d2bbfce5750ae8dc592a3b63c27";
23-
sha256 = "sha256-L76xdhQOeda4rtKJhGHNBkk9CdEpH5t+PZEobHkzzcE=";
22+
rev = "7152e15489d2077cd299ee23e3d51a4c599ab14f";
23+
sha256 = "sha256-4gqDkZdz3r1DZWBD0aumKn7yyfBgfayADLNm8EXEyCw=";
2424
};
2525

2626
buildInputs = [pkgs.makeWrapper];
2727

28-
makeFlags = ["PREFIX=$(out)"];
28+
makeFlags = ["PREFIX=$(out)" "XCFLAGS=-DLUAJIT_ENABLE_LUA52COMPAT" "BUILDMODE=static"];
29+
30+
buildPhase = ''
31+
make amalg PREFIX=$out XCFLAGS="-DLUAJIT_ENABLE_LUA52COMPAT" BUILDMODE=static
32+
'';
2933

3034
installPhase = ''
3135
make install PREFIX=$out

test/tests/nattlua/analyzer/complex/cdata.nlua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ do --- smoke band
3030
LuaJITArch() ~= "arm64"
3131
)
3232
then
33-
attest.equal(tostring(band(1ll, 1, 1ull, -1)), "0ULL")
33+
attest.equal(tostring(band(1ll, 1, 1ull, -1)), "1ULL")
3434
end
3535
end
3636

0 commit comments

Comments
 (0)