From 5f43dbea703c44643dcc280308c6ec40e0e198b4 Mon Sep 17 00:00:00 2001 From: bootstrap-prime Date: Sun, 3 Jul 2022 17:13:45 -0400 Subject: [PATCH] dbus: use systemdMinimal to avoid dep cycle --- pkgs/development/libraries/dbus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4e41384847d4..075f2a67b70e 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -5,7 +5,7 @@ , pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic -, systemd +, systemdMinimal , audit , libapparmor , dbus @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { libX11 libICE libSM - ]) ++ lib.optional enableSystemd systemd + ]) ++ lib.optional enableSystemd systemdMinimal ++ lib.optionals stdenv.isLinux [ audit libapparmor ]; # ToDo: optional selinux? @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] - ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemd}/bin/systemctl" ]; + ++ lib.optionals enableSystemd [ "SYSTEMCTL=${systemdMinimal}/bin/systemctl" ]; NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";