From 08526fa936ee78ebca69508fb8e0fcc1098a66f0 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 17 Aug 2021 12:03:46 +0200 Subject: [PATCH 1/5] waybar: 0.9.7 -> 0.9.8 --- pkgs/applications/misc/waybar/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 6a3f33db27e6..b75a10bae659 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , meson +, cmake , pkg-config , ninja , wrapGAppsHook @@ -14,12 +15,14 @@ , 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 , withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl @@ -27,13 +30,13 @@ 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 = [ @@ -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; From 2eda9b76765f77a406713b861981242729dcff6a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 17 Aug 2021 18:16:49 -0700 Subject: [PATCH 2/5] waybar: remove unnecessary cmake nativeBuildDep --- pkgs/applications/misc/waybar/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index b75a10bae659..73321a514e63 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , meson -, cmake , pkg-config , ninja , wrapGAppsHook @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkg-config scdoc wrapGAppsHook cmake + meson ninja pkg-config scdoc wrapGAppsHook ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ From 358aafb69371e6e6b8d603084aa71351052c9602 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 17 Aug 2021 18:17:07 -0700 Subject: [PATCH 3/5] waybar: remove deprecated -Dout meson option --- pkgs/applications/misc/waybar/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 73321a514e63..59639c1613c0 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { mpd = mpdSupport; } ) ++ [ - "-Dout=${placeholder "out"}" "-Dsystemd=disabled" ]; From a71946413efbaf63520621057a001fd1c6b29a62 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 17 Aug 2021 18:17:24 -0700 Subject: [PATCH 4/5] waybar: explicitly enable layer-shell and manpages --- pkgs/applications/misc/waybar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 59639c1613c0..c74b79b3cb64 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { } ) ++ [ "-Dsystemd=disabled" + "-Dgtk-layer-shell=enabled" + "-Dman-pages=enabled" ]; preFixup = lib.optional withMediaPlayer '' From 77a51be0f27800fe6340ee26b7fee4f858dc5ccd Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 17 Aug 2021 18:17:36 -0700 Subject: [PATCH 5/5] waybar: expose rfkillSupport --- pkgs/applications/misc/waybar/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index c74b79b3cb64..88f0e13e91ba 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -16,14 +16,15 @@ , gtk-layer-shell , 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 +, 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 }: @@ -69,6 +70,7 @@ stdenv.mkDerivation rec { libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; + rfkill = rfkillSupport; } ) ++ [ "-Dsystemd=disabled"