summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2022-05-23 20:09:25 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-07-11 17:53:19 +0000
commita8c50d44b68273bb5efef7d2bd632834277d7469 (patch)
treef072867e5981180c24da3564062cc7ecbed8bb90
parentMerge pull request #181006 from NixOS/backport-180924-to-release-22.05 (diff)
downloadnixpkgs-a8c50d44b68273bb5efef7d2bd632834277d7469.tar.gz
waybar: 0.9.12 -> 0.9.13
added upower support, enabled by default (cherry picked from commit ffe324d8bd63cb03f8cfaaa8f4de61efb4bb6ec3)
-rw-r--r--pkgs/applications/misc/waybar/default.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index 01b7af16409d..0053b8d873d8 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -25,18 +25,19 @@
, swaySupport ? true, sway
, mpdSupport ? true, libmpdclient
, rfkillSupport ? true
+, upowerSupport ? true, upower
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
}:
stdenv.mkDerivation rec {
pname = "waybar";
- version = "0.9.12";
+ version = "0.9.13";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
- sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8=";
+ sha256 = "sha256-Uzg2IrCDD8uUdGAveA8IjvonJnnnobOrAgjGG1kQ3pU=";
};
nativeBuildInputs = [
@@ -52,14 +53,15 @@ stdenv.mkDerivation rec {
buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
- ++ optional traySupport libdbusmenu-gtk3
- ++ optional pulseSupport libpulseaudio
- ++ optional sndioSupport sndio
- ++ optional nlSupport libnl
- ++ optional udevSupport udev
- ++ optional evdevSupport libevdev
- ++ optional swaySupport sway
- ++ optional mpdSupport libmpdclient;
+ ++ optional traySupport libdbusmenu-gtk3
+ ++ optional pulseSupport libpulseaudio
+ ++ optional sndioSupport sndio
+ ++ optional nlSupport libnl
+ ++ optional udevSupport udev
+ ++ optional evdevSupport libevdev
+ ++ optional swaySupport sway
+ ++ optional mpdSupport libmpdclient
+ ++ optional upowerSupport upower;
checkInputs = [ catch2 ];
doCheck = runTests;
@@ -74,6 +76,7 @@ stdenv.mkDerivation rec {
libudev = udevSupport;
mpd = mpdSupport;
rfkill = rfkillSupport;
+ upower_glib = upowerSupport;
tests = runTests;
}
) ++ [