tinysparql: remove systemd and dbus dependencies
The only thing these are used for is determining what path to install services to. For D-Bus, there's a sensible default, but for systemd, we have to specify. I've also removed the platform check for installing the units, because the main reason for it would have been to avoid the build failure, and they shouldn't hurt and we have seen attempts to port systemd to other platforms…
This commit is contained in:
parent
cdfd14fd93
commit
f78aa37a7b
@ -26,7 +26,6 @@
|
||||
libsoup_3,
|
||||
json-glib,
|
||||
avahi,
|
||||
systemd,
|
||||
dbus,
|
||||
man-db,
|
||||
writeText,
|
||||
@ -75,22 +74,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
glib
|
||||
libxml2
|
||||
sqlite
|
||||
icu
|
||||
libsoup_3
|
||||
libuuid
|
||||
json-glib
|
||||
avahi
|
||||
libstemmer
|
||||
dbus
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
systemd
|
||||
];
|
||||
buildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
sqlite
|
||||
icu
|
||||
libsoup_3
|
||||
libuuid
|
||||
json-glib
|
||||
avahi
|
||||
libstemmer
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
@ -100,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mesonFlags =
|
||||
[
|
||||
"-Ddocs=true"
|
||||
"-Dsystemd_user_services_dir=${placeholder "out"}/lib/systemd/user"
|
||||
(lib.mesonEnable "introspection" withIntrospection)
|
||||
(lib.mesonEnable "vapi" withIntrospection)
|
||||
]
|
||||
@ -114,10 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
"--cross-file=${crossFile}"
|
||||
]
|
||||
)
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux) [
|
||||
"-Dsystemd_user_services=false"
|
||||
];
|
||||
);
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user