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

Merge pull request #301036 from teto/teto/debug-sqlite

Browse Source 
luaPackages.sqlite: fix build
This commit is contained in:
Weijia Wang 2024-04-03 10:39:30 +02:00 committed by GitHub
commit 04eb65dadd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/lua-modules/overrides.nix
View File

@ -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)