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

luajitPackages.mpack: disable with new isLuaJIT function insead of

Browse Source 
marking it as broken
This commit is contained in:
xd1le 2017-10-09 23:21:48 +11:00
parent df5691d677
commit b83c89b6b4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/lua-packages.nix
View File

@ -14,6 +14,7 @@
let let
isLua51 = lua.luaversion == "5.1"; isLua51 = lua.luaversion == "5.1";
isLua52 = lua.luaversion == "5.2"; isLua52 = lua.luaversion == "5.2";
isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
platformString = platformString =
if stdenv.isDarwin then "macosx" if stdenv.isDarwin then "macosx"
@ -534,13 +535,13 @@ let
"LUA_VERSION_MAJ_MIN=" "LUA_VERSION_MAJ_MIN="
"LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}"
]; ];
# gcc -llua fails with luajit.
disabled = isLuaJIT;
meta = { meta = {
description = "Simple implementation of msgpack in C Lua 5.1"; description = "Simple implementation of msgpack in C Lua 5.1";
homepage = "https://github.com/tarruda/libmpack"; homepage = "https://github.com/tarruda/libmpack";
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
# gcc -llua fails with luajit
broken = (builtins.parseDrvName lua.name).name != "lua";
}; };
}; };