Merge pull request #198023 from ilkecan/waybar-0.9.14

This commit is contained in:
Bernardo Meurer 2022-10-27 12:03:45 +01:00 committed by GitHub
commit 9268544771
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,30 +14,33 @@
, spdlog , spdlog
, gtk-layer-shell , gtk-layer-shell
, howard-hinnant-date , howard-hinnant-date
, libinotify-kqueue
, libxkbcommon , libxkbcommon
, runTests ? true, catch2
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? true, libpulseaudio
, sndioSupport ? true, sndio
, nlSupport ? true, libnl
, udevSupport ? true, udev
, evdevSupport ? true, libevdev , evdevSupport ? true, libevdev
, swaySupport ? true, sway , inputSupport ? true, libinput
, jackSupport ? true, libjack2
, mpdSupport ? true, libmpdclient , mpdSupport ? true, libmpdclient
, nlSupport ? true, libnl
, pulseSupport ? true, libpulseaudio
, rfkillSupport ? true , rfkillSupport ? true
, upowerSupport ? true, upower , runTests ? true, catch2_3
, sndioSupport ? true, sndio
, swaySupport ? true, sway
, traySupport ? true, libdbusmenu-gtk3
, udevSupport ? true, udev
, upowerSupport ? true, upower
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "waybar"; pname = "waybar";
version = "0.9.13"; version = "0.9.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexays"; owner = "Alexays";
repo = "Waybar"; repo = "Waybar";
rev = version; rev = version;
sha256 = "sha256-Uzg2IrCDD8uUdGAveA8IjvonJnnnobOrAgjGG1kQ3pU="; sha256 = "sha256-1tnFBUB7/MjnrCkfKOR2SZ/GB5Ik115zsnwjkNMB05E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -53,31 +56,36 @@ stdenv.mkDerivation rec {
buildInputs = with lib; buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
++ optional traySupport libdbusmenu-gtk3 ++ optional (!stdenv.isLinux) libinotify-kqueue
++ optional evdevSupport libevdev
++ optional inputSupport libinput
++ optional jackSupport libjack2
++ optional mpdSupport libmpdclient
++ optional nlSupport libnl
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optional sndioSupport sndio ++ optional sndioSupport sndio
++ optional nlSupport libnl
++ optional udevSupport udev
++ optional evdevSupport libevdev
++ optional swaySupport sway ++ optional swaySupport sway
++ optional mpdSupport libmpdclient ++ optional traySupport libdbusmenu-gtk3
++ optional udevSupport udev
++ optional upowerSupport upower; ++ optional upowerSupport upower;
checkInputs = [ catch2 ]; checkInputs = [ catch2_3 ];
doCheck = runTests; doCheck = runTests;
mesonFlags = (lib.mapAttrsToList mesonFlags = (lib.mapAttrsToList
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
{ {
dbusmenu-gtk = traySupport; dbusmenu-gtk = traySupport;
pulseaudio = pulseSupport; jack = jackSupport;
sndio = sndioSupport; libinput = inputSupport;
libnl = nlSupport; libnl = nlSupport;
libudev = udevSupport; libudev = udevSupport;
mpd = mpdSupport; mpd = mpdSupport;
pulseaudio = pulseSupport;
rfkill = rfkillSupport; rfkill = rfkillSupport;
upower_glib = upowerSupport; sndio = sndioSupport;
tests = runTests; tests = runTests;
upower_glib = upowerSupport;
} }
) ++ [ ) ++ [
"-Dsystemd=disabled" "-Dsystemd=disabled"