diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-03 10:39:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 10:39:30 +0200 |
| commit | 04eb65dadda36a0ababf8196a584306dbab8b45f (patch) | |
| tree | 6c3c850c3ae958c6cab4cea2373db136f315756e /pkgs | |
| parent | 213b1a46b6575d065f036056524fddba5d86b7f3 (diff) | |
| parent | 97cec92c51184ed53ea4d59325f057b9af402b69 (diff) | |
Merge pull request #301036 from teto/teto/debug-sqlite
luaPackages.sqlite: fix build
Diffstat (limited to 'pkgs')
| -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) |