alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #179320 from twz123/update-swayr

Browse source 
swayr: 0.16.1 -> 0.19.0
This commit is contained in:
Artturi 2022-06-29 17:07:38 +03:00 committed by GitHub
parent 1db6fe6ad6 3ec5b6c84a
commit 1c183e7d1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/wayland/swayr/default.nix
View file

@ -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
'';

12
pkgs/tools/wayland/swayr/icon-paths.patch
View file

@ -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(),