feat: waybar overlay for unreleased fix

khaneliman · Jan 10, 2024 · 50cfdef · 50cfdef
1 parent c2218fc
commit 50cfdef
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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 ];
+  });
+}