ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

dbus: use systemdMinimal to avoid dep cycle

Browse Source
This commit is contained in:
bootstrap-prime 2022-07-03 17:13:45 -04:00
parent 3b9048a3ce
commit 5f43dbea70
No known key found for this signature in database
GPG Key ID: B2D7CBCE8713622C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/dbus/default.nix
View File

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, expat , expat
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
, systemd , systemdMinimal
, audit , audit
, libapparmor , libapparmor
, dbus , dbus
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
libX11 libX11
libICE libICE
libSM libSM
]) ++ lib.optional enableSystemd systemd ]) ++ lib.optional enableSystemd systemdMinimal
++ lib.optionals stdenv.isLinux [ audit libapparmor ]; ++ lib.optionals stdenv.isLinux [ audit libapparmor ];
# ToDo: optional selinux? # ToDo: optional selinux?
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
"--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
] ++ lib.optional (!x11Support) "--without-x" ] ++ lib.optional (!x11Support) "--without-x"
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ] ++ 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"; NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";