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