Merge pull request #206537 from atorres1985-contrib/misc-updates

yambar: 1.8.0 -> 1.9.0

pkgs/applications/misc/yambar/default.nix

@@ -2,15 +2,19 @@
 , stdenv
 , fetchFromGitea
 , alsa-lib
+, bison
 , fcft
+, flex
 , json_c
 , libmpdclient
 , libxcb
 , libyaml
 , meson
 , ninja
+, pipewire
 , pixman
 , pkg-config
+, pulseaudio
 , scdoc
 , tllist
 , udev
@@ -26,26 +30,27 @@
 }:
 
 let
-  # Courtesy of sternenseemann and FRidh
-  mesonFeatureFlag = feature: flag:
-    "-D${feature}=${if flag then "enabled" else "disabled"}";
+  inherit (lib) mesonEnable;
 in
-stdenv.mkDerivation rec {
+assert (x11Support || waylandSupport);
+stdenv.mkDerivation (finalAttrs: {
   pname = "yambar";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "dnkl";
     repo = "yambar";
-    rev = version;
-    hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU=";
+    rev = finalAttrs.version;
+    hash = "sha256-0bgRnZYLGWJ9PE62i04hPBcgzWyd30DK7AUuejSgta4=";
   };
 
   nativeBuildInputs = [
-    pkg-config
+    bison
+    flex
     meson
     ninja
+    pkg-config
     scdoc
     wayland-scanner
   ];
@@ -56,7 +61,9 @@ stdenv.mkDerivation rec {
     json_c
     libmpdclient
     libyaml
+    pipewire
     pixman
+    pulseaudio
     tllist
     udev
   ] ++ lib.optionals (waylandSupport) [
@@ -72,13 +79,13 @@ stdenv.mkDerivation rec {
   mesonBuildType = "release";
 
   mesonFlags = [
-    (mesonFeatureFlag "backend-x11" x11Support)
-    (mesonFeatureFlag "backend-wayland" waylandSupport)
+    (mesonEnable "backend-x11" x11Support)
+    (mesonEnable "backend-wayland" waylandSupport)
   ];
 
   meta = with lib; {
     homepage = "https://codeberg.org/dnkl/yambar";
-    changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${version}";
+    changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}";
     description = "Modular status panel for X11 and Wayland";
     longDescription = ''
       yambar is a lightweight and configurable status panel (bar, for short) for
@@ -107,6 +114,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; unix;
+    platforms = platforms.linux;
   };
-}
+})