From 51dbc48b3baed382797a5009dc6a510a56028887 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 11 Jul 2021 03:37:59 +0300 Subject: [PATCH] swayr: init at 0.6.1 --- pkgs/tools/wayland/swayr/default.nix | 30 +++++++++++++++++++++++ pkgs/tools/wayland/swayr/icon-paths.patch | 17 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/tools/wayland/swayr/default.nix create mode 100644 pkgs/tools/wayland/swayr/icon-paths.patch diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix new file mode 100644 index 00000000000..24a830a7277 --- /dev/null +++ b/pkgs/tools/wayland/swayr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayr"; + version = "0.6.1"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "v${version}"; + sha256 = "1865064q8jb75nfb0hbx4swbbijpibm0n7m4cid8qgylzp4bxvs2"; + }; + + cargoSha256 = "0w6zjnywifdlaw01xz2824lwm4b6r1b7r99wi3p12vgbrmks4jcr"; + + patches = [ + ./icon-paths.patch + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "A window switcher (and more) for sway"; + homepage = "https://git.sr.ht/~tsdh/swayr"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/tools/wayland/swayr/icon-paths.patch new file mode 100644 index 00000000000..8fafc4c4153 --- /dev/null +++ b/pkgs/tools/wayland/swayr/icon-paths.patch @@ -0,0 +1,17 @@ +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 { + ), + urgency_end: Some("".to_string()), + icon_dirs: Some(vec![ ++ "/run/current-system/sw/share/icons/hicolor/scalable/apps".to_string(), ++ "/run/current-system/sw/share/icons/hicolor/48x48/apps".to_string(), ++ "/run/current-system/sw/share/pixmaps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/scalable/apps".to_string(), ++ "~/.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/48x48/apps".to_string(), + "/usr/share/pixmaps".to_string(), diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6b95e8f4a..f3dede5b7e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,6 +2301,8 @@ in swaycwd = callPackage ../tools/wayland/swaycwd { }; + swayr = callPackage ../tools/wayland/swayr { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };