From b83c89b6b488653d935e038a4d1763e0f814caa5 Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:21:48 +1100 Subject: [PATCH] luajitPackages.mpack: disable with new isLuaJIT function insead of marking it as broken --- pkgs/top-level/lua-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ff1108471bd..bea78a4c7df 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -14,6 +14,7 @@ let isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; + isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; platformString = if stdenv.isDarwin then "macosx" @@ -534,13 +535,13 @@ let "LUA_VERSION_MAJ_MIN=" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" ]; + # gcc -llua fails with luajit. + disabled = isLuaJIT; meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; - # gcc -llua fails with luajit - broken = (builtins.parseDrvName lua.name).name != "lua"; }; };