Skip to content

Commit 08743fe

Browse files
committedJul 10, 2017
luajit: 2.0 actually doesn't support aarch64 at all
I suppose 2.1 with caveats with some pointers is better than nothing. I'm sorry for the potential confusion. In particular, the problem about 64-bit pointers is the same in 2.0 and 2.1, despite the warning only being shown for 2.1 on the web site.
1 parent 299af45 commit 08743fe

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed
 

‎pkgs/development/interpreters/luajit/default.nix

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
{ stdenv, fetchurl, hostPlatform }:
1+
{ stdenv, lib, fetchurl, hostPlatform }:
22
rec {
33

4-
luajit =
5-
# Compatibility problems with lightuserdata pointers; see:
6-
# https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
7-
if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
8-
# FIXME: fix the aarch64 build
9-
then luajit_2_0
10-
else luajit_2_1;
4+
luajit = luajit_2_1;
115

126
luajit_2_0 = generic {
137
version = "2.0.5";
148
isStable = true;
159
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
10+
} // {
11+
# 64-bit ARM isn't supported upstream
12+
meta = meta // {
13+
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
14+
};
1615
};
1716

1817
luajit_2_1 = generic {
@@ -22,6 +21,14 @@ rec {
2221
};
2322

2423

24+
meta = with stdenv.lib; {
25+
description = "High-performance JIT compiler for Lua 5.1";
26+
homepage = http://luajit.org;
27+
license = licenses.mit;
28+
platforms = platforms.linux ++ platforms.darwin;
29+
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
30+
};
31+
2532
generic =
2633
{ version, sha256 ? null, isStable
2734
, name ? "luajit-${version}"
@@ -33,7 +40,7 @@ rec {
3340
}:
3441

3542
stdenv.mkDerivation rec {
36-
inherit name version src;
43+
inherit name version src meta;
3744

3845
luaversion = "5.1";
3946

@@ -61,13 +68,5 @@ rec {
6168
''
6269
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
6370
'';
64-
65-
meta = with stdenv.lib; {
66-
description = "High-performance JIT compiler for Lua 5.1";
67-
homepage = http://luajit.org;
68-
license = licenses.mit;
69-
platforms = platforms.linux ++ platforms.darwin;
70-
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
71-
};
7271
};
7372
}

0 commit comments

Comments
 (0)
Please sign in to comment.