Merge pull request #134418 from tobim/pkgs/waybar-0.9.8

waybar: 0.9.7 -> 0.9.8
This commit is contained in:
Bernardo Meurer 2021-08-18 02:15:29 +00:00 committed by GitHub
commit 3788c68def
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,30 +14,33 @@
, scdoc
, spdlog
, gtk-layer-shell
, howard-hinnant-date, cmake
, howard-hinnant-date
, libxkbcommon
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? true, libpulseaudio
, sndioSupport ? true, sndio
, nlSupport ? true, libnl
, udevSupport ? true, udev
, evdevSupport ? true, libevdev
, swaySupport ? true, sway
, mpdSupport ? true, libmpdclient
, rfkillSupport ? true
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
}:
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x";
sha256 = "sha256-XOguhbvlO3iUyk5gWOvimipXV8yqnia0LKoSA1wiKoE=";
};
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook cmake
meson ninja pkg-config scdoc wrapGAppsHook
] ++ lib.optional withMediaPlayer gobject-introspection;
propagatedBuildInputs = lib.optionals withMediaPlayer [
@ -48,12 +51,13 @@ stdenv.mkDerivation rec {
strictDeps = false;
buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt 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;
@ -66,10 +70,12 @@ stdenv.mkDerivation rec {
libnl = nlSupport;
libudev = udevSupport;
mpd = mpdSupport;
rfkill = rfkillSupport;
}
) ++ [
"-Dout=${placeholder "out"}"
"-Dsystemd=disabled"
"-Dgtk-layer-shell=enabled"
"-Dman-pages=enabled"
];
preFixup = lib.optional withMediaPlayer ''