From 1fdec5ccddf4f5f5c26ab50f1dad3577bebd37df Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Tue, 9 Sep 2025 04:51:50 +0900 Subject: [PATCH 1/2] wleave: add updateScript Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index d656610780dc..f9ffefb4e40d 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -10,6 +10,7 @@ glib, gtk4, gtk4-layer-shell, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "wleave"; @@ -62,6 +63,8 @@ rustPlatform.buildRustPackage rec { --zsh <(cat completions/_wleave) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Wayland-native logout script written in GTK4"; homepage = "https://github.com/AMNatty/wleave"; From f01814fafaa4ab49dbf14c60a5b7b27036be173f Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 8 Sep 2025 19:56:36 +0000 Subject: [PATCH 2/2] wleave: 0.5.1 -> 0.6.2 Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index f9ffefb4e40d..88be28510231 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -2,6 +2,9 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, + + # Deps installShellFiles, pkg-config, scdoc, @@ -10,20 +13,22 @@ glib, gtk4, gtk4-layer-shell, - nix-update-script, + libadwaita, + librsvg, + libxml2, }: rustPlatform.buildRustPackage rec { pname = "wleave"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "AMNatty"; repo = "wleave"; rev = version; - hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA="; + hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ="; }; - cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc="; + cargoHash = "sha256-MRVWiQNzETFbWeKwYeoXSUY9gncRCsYdPEZhpOKcTvA="; nativeBuildInputs = [ installShellFiles @@ -37,18 +42,21 @@ rustPlatform.buildRustPackage rec { glib gtk4 gtk4-layer-shell + libadwaita + librsvg + libxml2 ]; postPatch = '' - substituteInPlace style.css \ - --replace-fail "/usr/share/wleave" "$out/share/${pname}" - - substituteInPlace src/main.rs \ + substituteInPlace src/config.rs \ --replace-fail "/etc/wleave" "$out/etc/${pname}" + + substituteInPlace layout.json \ + --replace-fail "/usr/share/wleave" "$out/share/${pname}" ''; postInstall = '' - install -Dm644 -t "$out/etc/wleave" {"style.css","layout"} + install -Dm644 -t "$out/etc/wleave" {"style.css","layout.json"} install -Dm644 -t "$out/share/wleave/icons" icons/* for f in man/*.scd; do