From 50cfdef46f8e70919727eed445bc2af1d0537087 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 10 Jan 2024 11:58:53 -0600
Subject: [PATCH] feat: waybar overlay for unreleased fix

---
 modules/home/desktop/addons/waybar/default.nix |  3 ++-
 overlays/waybar/catch.patch                    | 13 +++++++++++++
 overlays/waybar/default.nix                    | 13 +++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 overlays/waybar/catch.patch
 create mode 100644 overlays/waybar/default.nix

diff --git a/modules/home/desktop/addons/waybar/default.nix b/modules/home/desktop/addons/waybar/default.nix
index 486fa9e6d..63adfff65 100644
--- a/modules/home/desktop/addons/waybar/default.nix
+++ b/modules/home/desktop/addons/waybar/default.nix
@@ -89,7 +89,8 @@ in
 
     programs.waybar = {
       enable = true;
-      package = nixpkgs-wayland.packages.${system}.waybar;
+      # package = nixpkgs-wayland.packages.${system}.waybar;
+      package = pkgs.waybar;
       systemd.enable = true;
 
       # TODO: make dynamic / support different number of bars etc
diff --git a/overlays/waybar/catch.patch b/overlays/waybar/catch.patch
new file mode 100644
index 000000000..3771a1f78
--- /dev/null
+++ b/overlays/waybar/catch.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index c4f4020..5330914 100644
+--- a/meson.build
++++ b/meson.build
+@@ -535,7 +535,7 @@ endif
+ 
+ catch2 = dependency(
+     'catch2',
+-    version: '>=3.5.1',
++    version: '>=3.4.0',
+     fallback: ['catch2', 'catch2_dep'],
+     required: get_option('tests'),
+ )
diff --git a/overlays/waybar/default.nix b/overlays/waybar/default.nix
new file mode 100644
index 000000000..3f1756601
--- /dev/null
+++ b/overlays/waybar/default.nix
@@ -0,0 +1,13 @@
+_: _final: prev: {
+  waybar = prev.waybar.overrideAttrs (old: {
+    version = "unstable-waybar";
+    src = prev.fetchFromGitHub {
+      owner = "Syndelis";
+      repo = "waybar";
+      rev = "9e08512927d2de34a55281ee7fc3f13c36c6c9c5";
+      sha256 = "sha256-7hyOmMTkvQ1a7yQ4YA5Kheg9FLUAPV3otvDj7kGKgko=";
+    };
+
+    patches = [ ./catch.patch ];
+  });
+}