diff options
-rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index e470bef93aadf..a793f56f99d04 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -56,7 +56,9 @@ }: final: prev: -with prev; +let + inherit (prev) luaOlder luaAtLeast lua isLuaJIT; +in { argparse = prev.argparse.overrideAttrs(oa: { @@ -176,10 +178,12 @@ with prev; }); ldbus = prev.ldbus.overrideAttrs (oa: { - luarocksConfig.variables = { - DBUS_DIR = "${dbus.lib}"; - DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include"; - DBUS_INCDIR = "${dbus.dev}/include/dbus-1.0"; + luarocksConfig = oa.luarocksConfig // { + variables = { + DBUS_DIR = "${dbus.lib}"; + DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR = "${dbus.dev}/include/dbus-1.0"; + }; }; buildInputs = [ dbus @@ -202,7 +206,7 @@ with prev; ''; meta.broken = luaOlder "5.1" || luaAtLeast "5.3"; - propagatedBuildInputs = with lib; oa.propagatedBuildInputs ++ optional (!isLuaJIT) luaffi; + propagatedBuildInputs = with lib; oa.propagatedBuildInputs ++ optional (!isLuaJIT) final.luaffi; }); lgi = prev.lgi.overrideAttrs (oa: { @@ -349,7 +353,7 @@ with prev; luaevent = prev.luaevent.overrideAttrs (oa: { propagatedBuildInputs = oa.propagatedBuildInputs ++ [ - luasocket + final.luasocket ]; externalDeps = [ { name = "EVENT"; dep = libevent; } @@ -535,8 +539,8 @@ with prev; buildInputs = [ libuv ]; # Use system libuv instead of building local and statically linking - luarocksConfig.variables = { - WITH_SHARED_LIBUV = "ON"; + luarocksConfig = lib.recursiveUpdate oa.luarocksConfig { + variables = { WITH_SHARED_LIBUV = "ON"; }; }; # we unset the LUA_PATH since the hook erases the interpreter defaults (To fix) |