JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luajit: 2.0 actually doesn't support aarch64 at all

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2017-07-10 14:07:54 +02:00
parent 299af45989
commit 08743fe0a3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/interpreters/luajit/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, hostPlatform }:
{ stdenv, lib, fetchurl, hostPlatform }:
rec {
luajit =
# Compatibility problems with lightuserdata pointers; see:
# https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
# FIXME: fix the aarch64 build
then luajit_2_0
else luajit_2_1;
luajit = luajit_2_1;
luajit_2_0 = generic {
version = "2.0.5";
isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
} // {
# 64-bit ARM isn't supported upstream
meta = meta // {
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
};
};
luajit_2_1 = generic {
@ -22,6 +21,14 @@ rec {
};
meta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
};
generic =
{ version, sha256 ? null, isStable
, name ? "luajit-${version}"
@ -33,7 +40,7 @@ rec {
}:
stdenv.mkDerivation rec {
inherit name version src;
inherit name version src meta;
luaversion = "5.1";
@ -61,13 +68,5 @@ rec {
''
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
'';
meta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
};
};
}