Merge pull request from khaneliman/waybar

waybar: 0.9.24 -> 0.10.0
This commit is contained in:
Maximilian Bosch 2024-03-15 13:29:32 +00:00 committed by GitHub
commit 96e9df615c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -68,24 +68,24 @@ let
libcava.src = fetchFromGitHub { libcava.src = fetchFromGitHub {
owner = "LukashonakV"; owner = "LukashonakV";
repo = "cava"; repo = "cava";
rev = "0.9.1"; rev = "0.10.1";
hash = "sha256-FnRJJV0poRmw+y4nt1X7Z0ipX86LRK1TJhNKHFk0rTw="; hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
}; };
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "waybar"; pname = "waybar";
version = "0.9.24"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexays"; owner = "Alexays";
repo = "Waybar"; repo = "Waybar";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0="; hash = "sha256-p1VRrKT2kTDy48gDXPMHlLbfcokAOFeTZXGzTeO1SAE=";
}; };
postUnpack = lib.optional cavaSupport '' postUnpack = lib.optional cavaSupport ''
pushd "$sourceRoot" pushd "$sourceRoot"
cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.9.1 cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.1
patchShebangs . patchShebangs .
popd popd
''; '';
@ -147,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = (lib.mapAttrsToList lib.mesonEnable { mesonFlags = (lib.mapAttrsToList lib.mesonEnable {
"cava" = cavaSupport; "cava" = cavaSupport;
"dbusmenu-gtk" = traySupport; "dbusmenu-gtk" = traySupport;
"gtk-layer-shell" = true;
"jack" = jackSupport; "jack" = jackSupport;
"libinput" = inputSupport; "libinput" = inputSupport;
"libnl" = nlSupport; "libnl" = nlSupport;