From 97c3cd8141699853bd9128b4dd94cddbd5c51692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Fri, 29 Mar 2024 13:52:56 +0100
Subject: [PATCH] fix: Waybar overlay includes the patch twice

---
 flake.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4446258..54bf6d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,15 +86,18 @@
         jpassmenu = jpassmenu.overlays.default;
         audiomenu = audiomenu.overlays.default;
         "waybar-sway-patch" = final: prev: {
-          waybar = prev.waybar.overrideAttrs (old: {
-            patches = (old.patches or [ ]) ++ [
+          waybar = prev.waybar.overrideAttrs (old:
+            let
               # Fixes https://github.com/Alexays/Waybar/issues/3009
-              (final.fetchpatch {
+              patch = final.fetchpatch {
                 url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/3037.patch";
                 hash = "sha256-u87t6zzslk1mzSfi4HQ6zDPFr7qMfsvymTy3HBxVTJQ=";
-              })
-            ];
-          });
+              };
+              prevPatches = old.patches or [ ];
+              # Deduplicate patch
+              present = builtins.elem patch prevPatches;
+            in
+            { patches = prevPatches ++ final.lib.optional present patch; });
         };
       };