From 2c15c76d47101962a6ca564a6eb048e9596edec9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 3 Aug 2024 16:21:21 +0200 Subject: [PATCH] pipewire: restore enableSystemd option This is important to me, and I volunteer to maintain it going forward, just I have in the past (e.g. db5ed5d7fb8e ("pipewire: fix enableSystemd option")). Partial revert of 3cf28607c140 ("pipewire: remove superfluous args"). --- pkgs/development/libraries/pipewire/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index f4b411776a66..7e37b5400e1c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -5,6 +5,7 @@ , meson , ninja , systemd +, enableSystemd ? true , pkg-config , docutils , doxygen @@ -14,6 +15,7 @@ , alsa-lib , libjack2 , libusb1 +, udev , libsndfile , vulkanSupport ? true , vulkan-headers @@ -118,8 +120,7 @@ stdenv.mkDerivation(finalAttrs: { ncurses readline sbc - systemd - ] + ] ++ (if enableSystemd then [ systemd ] else [ udev ]) ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt ++ lib.optional zeroconfSupport avahi @@ -145,9 +146,9 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonEnable "avahi" zeroconfSupport) (lib.mesonEnable "gstreamer" true) (lib.mesonEnable "gstreamer-device-provider" true) - (lib.mesonEnable "systemd" true) - (lib.mesonEnable "systemd-system-service" true) - (lib.mesonEnable "udev" false) + (lib.mesonEnable "systemd" enableSystemd) + (lib.mesonEnable "systemd-system-service" enableSystemd) + (lib.mesonEnable "udev" (!enableSystemd)) (lib.mesonEnable "ffmpeg" true) (lib.mesonEnable "pw-cat-ffmpeg" true) (lib.mesonEnable "bluez5" true)