From 6e3e40e68b72269ea5c9148066aaef0b9483bc08 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 18 Mar 2024 10:57:20 +0100 Subject: [PATCH] waybar: fix build without cava support With Waybar v0.10.0 a new "pipewire" module was added that will display whether certain PipeWire features are certainly in use. Naturally, this option requires libpipewire to be present. And by default it is getting pulled in indeed via "cava" support flag. But when disabling that flag then building Waybar will break due to the missing dependency. Fix this by wiring up a new `pipewireSupport` flag. If either that flag or the `cavaSupport` flag are set then we will pull in the "pipewire" library. --- pkgs/applications/misc/waybar/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 823cf7fa75ec..47071c60f294 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -51,6 +51,7 @@ , mpdSupport ? true , mprisSupport ? stdenv.isLinux , nlSupport ? true +, pipewireSupport ? true , pulseSupport ? true , rfkillSupport ? true , runTests ? true @@ -122,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { fftw iniparser ncurses - pipewire portaudio ] ++ lib.optional evdevSupport libevdev @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional udevSupport udev ++ lib.optional upowerSupport upower ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional (cavaSupport || pipewireSupport) pipewire ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; @@ -154,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { "man-pages" = true; "mpd" = mpdSupport; "mpris" = mprisSupport; + "pipewire" = pipewireSupport; "pulseaudio" = pulseSupport; "rfkill" = rfkillSupport; "sndio" = sndioSupport;