From 9d127b78f66a7777cb9c7856d52fb6627ca32c37 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 4 Jun 2019 21:15:29 +0200 Subject: [PATCH] waybar: DRY refactor --- pkgs/applications/misc/waybar/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3dad7a3d9dd..045b78b92c5 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -31,12 +31,16 @@ ++ optional swaySupport sway ++ optional mpdSupport mpd_clientlib; - mesonFlags = [ - "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" - "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" - "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" - "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" - "-Dmpd=${ if mpdSupport then "enabled" else "disabled" }" + mesonFlags = (stdenv.lib.mapAttrsToList + (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") + { + dbusmenu-gtk = traySupport; + pulseaudio = pulseSupport; + libnl = nlSupport; + libudev = udevSupport; + mpd = mpdSupport; + } + ) ++ [ "-Dout=${placeholder "out"}" ];