From 69b6ec0894d056627a8e074178d39b5e917477d3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 13 Sep 2024 09:52:40 +0200
Subject: [PATCH] waybar: 0.10.4 -> 0.11.0

Diff: https://github.com/Alexays/Waybar/compare/0.10.4...0.11.0

Changelog: https://github.com/alexays/waybar/releases/tag/0.11.0
---
 pkgs/by-name/wa/waybar/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index c92d04e5a9828..196e739b2aa66 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -6,6 +6,7 @@
   SDL2,
   alsa-lib,
   catch2_3,
+  fetchpatch,
   fftw,
   glib,
   gobject-introspection,
@@ -81,15 +82,27 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.10.4";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    rev = finalAttrs.version;
-    hash = "sha256-/JW3WnRLpfz8j+9Zc9YkK63i8DjHrKwv9PWKIMz3MVI=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
   };
 
+  patches = [
+    # Fix a regression introduced in release 0.11.0
+    # TODO: remove this patch when updating to the next release
+    # Issue: https://github.com/Alexays/Waybar/issues/3597
+    # PR: https://github.com/Alexays/Waybar/pull/3604
+    (fetchpatch {
+      name = "fix-tray";
+      url = "https://github.com/Alexays/Waybar/commit/0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch";
+      hash = "sha256-wpdK6AY+14jt85dOQy6xkh8tNGDN2F9GA9zOfAuOaIc=";
+    })
+  ];
+
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
     cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.2