about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/misc/waybar/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/waybar/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/misc/waybar/default.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix
index 11a4b1a51aad..8dd18de5d895 100644
--- a/nixpkgs/pkgs/applications/misc/waybar/default.nix
+++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook
 , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
 , howard-hinnant-date, cmake
 , traySupport  ? true,  libdbusmenu-gtk3
 , pulseSupport ? true,  libpulseaudio
+, sndioSupport ? true,  sndio
 , nlSupport    ? true,  libnl
 , udevSupport  ? true,  udev
 , swaySupport  ? true,  sway
@@ -11,40 +12,42 @@
 }:
   stdenv.mkDerivation rec {
     pname = "waybar";
-    version = "0.9.4";
+    version = "0.9.5";
 
     src = fetchFromGitHub {
       owner = "Alexays";
       repo = "Waybar";
       rev = version;
-      sha256 = "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy";
+      sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
     };
 
     nativeBuildInputs = [
-      meson ninja pkgconfig scdoc wrapGAppsHook cmake
-    ] ++ stdenv.lib.optional withMediaPlayer gobject-introspection;
+      meson ninja pkg-config scdoc wrapGAppsHook cmake
+    ] ++ lib.optional withMediaPlayer gobject-introspection;
 
-    propagatedBuildInputs = stdenv.lib.optionals withMediaPlayer [
+    propagatedBuildInputs = lib.optionals withMediaPlayer [
       glib
       playerctl
       python38Packages.pygobject3
     ];
     strictDeps = false;
 
-    buildInputs = with stdenv.lib;
+    buildInputs = with lib;
       [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
       ++ optional  traySupport  libdbusmenu-gtk3
       ++ optional  pulseSupport libpulseaudio
+      ++ optional  sndioSupport sndio
       ++ optional  nlSupport    libnl
       ++ optional  udevSupport  udev
       ++ optional  swaySupport  sway
       ++ optional  mpdSupport   mpd_clientlib;
 
-    mesonFlags = (stdenv.lib.mapAttrsToList
+    mesonFlags = (lib.mapAttrsToList
       (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
       {
         dbusmenu-gtk = traySupport;
         pulseaudio = pulseSupport;
+        sndio = sndioSupport;
         libnl = nlSupport;
         libudev = udevSupport;
         mpd = mpdSupport;
@@ -54,14 +57,14 @@
       "-Dsystemd=disabled"
     ];
 
-    preFixup = stdenv.lib.optional withMediaPlayer ''
+    preFixup = lib.optional withMediaPlayer ''
       cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
 
       wrapProgram $out/bin/waybar-mediaplayer.py \
         --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
       license = licenses.mit;
       maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];