From 3ec5b6c84ab5747a6d5ab7015f9c96dd39da1d95 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <tom@bibbu.net>
Date: Mon, 27 Jun 2022 12:22:12 +0200
Subject: [PATCH] swayr: 0.16.1 -> 0.19.0

---
 pkgs/tools/wayland/swayr/default.nix      | 11 +++++++----
 pkgs/tools/wayland/swayr/icon-paths.patch | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix
index b2f9a6cc7e50..d580f2e9e07a 100644
--- a/pkgs/tools/wayland/swayr/default.nix
+++ b/pkgs/tools/wayland/swayr/default.nix
@@ -2,21 +2,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swayr";
-  version = "0.16.1";
+  version = "0.19.0";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "swayr";
-    rev = "v${version}";
-    sha256 = "sha256-c/VHD5VceddhKanuId4rG1Tl+9Bg7zUmIqq4gMsy1e0=";
+    rev = "swayr-${version}";
+    sha256 = "sha256-ubindhU3G1iHqf/yiXIJk87uI3o5y2lfs22tbIfiqv4=";
   };
 
-  cargoSha256 = "sha256-0aGMWuU6DvBr9tvgDd1GZqhlY8bGCuPs8pSc5A03L3w=";
+  cargoSha256 = "sha256-X6BYLD7YmlHCO+3b3Ubai222tvsZUmZrwm3vS2PeqDY=";
 
   patches = [
     ./icon-paths.patch
   ];
 
+  # don't build swayrbar
+  buildAndTestSubdir = pname;
+
   preCheck = ''
     export HOME=$TMPDIR
   '';
diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/tools/wayland/swayr/icon-paths.patch
index 8fafc4c4153c..647863d3da84 100644
--- a/pkgs/tools/wayland/swayr/icon-paths.patch
+++ b/pkgs/tools/wayland/swayr/icon-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/src/config.rs b/src/config.rs
-index de7d04b..291114b 100644
---- a/src/config.rs
-+++ b/src/config.rs
-@@ -197,6 +197,12 @@ impl Default for Format {
+diff --git a/swayr/src/config.rs b/swayr/src/config.rs
+index bc6ec98..48cdc65 100644
+--- a/swayr/src/config.rs
++++ b/swayr/src/config.rs
+@@ -271,6 +271,12 @@ impl Default for Format {
              ),
              urgency_end: Some("</span>".to_string()),
              icon_dirs: Some(vec![
@@ -13,5 +13,5 @@ index de7d04b..291114b 100644
 +                "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(),
 +                "~/.nix-profile/share/pixmaps".to_string(),
                  "/usr/share/icons/hicolor/scalable/apps".to_string(),
+                 "/usr/share/icons/hicolor/64x64/apps".to_string(),
                  "/usr/share/icons/hicolor/48x48/apps".to_string(),
-                 "/usr/share/pixmaps".to_string(),