From ec2c294d1622add8ab2669c2ef931b2243aab5bf Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 25 Jul 2025 06:33:16 +0800 Subject: [PATCH 1/2] windsend-rs: use finalAttrs --- pkgs/by-name/wi/windsend-rs/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index 74211afd0413..0d11cf7252fc 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -14,14 +14,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "windsend-rs"; version = "1.5.4"; src = fetchFromGitHub { owner = "doraemonkeys"; repo = "WindSend"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM="; }; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9zuD3korJGIcarBV0bSSV/g/Q0niWAMqgRfwpPXCuBU="; - sourceRoot = "${src.name}/windSend-rs"; + sourceRoot = "${finalAttrs.src.name}/windSend-rs"; nativeBuildInputs = [ pkg-config @@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; -} +}) From 3bf278d14b2285532fdd2e1dce0126327453f9fe Mon Sep 17 00:00:00 2001 From: mivorasu Date: Fri, 25 Jul 2025 06:37:42 +0800 Subject: [PATCH 2/2] windsend-rs: 1.5.4 -> 1.5.5 --- pkgs/by-name/wi/windsend-rs/package.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index 0d11cf7252fc..cecbae0422c8 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -1,46 +1,44 @@ { lib, - fetchFromGitHub, rustPlatform, + fetchFromGitHub, + copyDesktopItems, pkg-config, - wayland, - openssl, glib, gtk3, + openssl, + wayland, xdotool, - libayatana-appindicator, makeDesktopItem, - copyDesktopItems, + libayatana-appindicator, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "windsend-rs"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "doraemonkeys"; repo = "WindSend"; tag = "v${finalAttrs.version}"; - hash = "sha256-A0cmjllyhKkYsMyjeuuMCax0uVnaDp9OwJPY7peDjPM="; + hash = "sha256-u82VmMuc7+tbc1Qgs5lbyFlNTauJm6E9KFXPHBdTryA="; }; - useFetchCargoVendor = true; - - cargoHash = "sha256-9zuD3korJGIcarBV0bSSV/g/Q0niWAMqgRfwpPXCuBU="; + cargoHash = "sha256-dn6O2cCOPInktrKrcZBwN2FwmKUjm3crCL6yhIPQj/Y="; sourceRoot = "${finalAttrs.src.name}/windSend-rs"; nativeBuildInputs = [ - pkg-config copyDesktopItems + pkg-config ]; buildInputs = [ - wayland - openssl glib gtk3 + openssl + wayland xdotool ];