From 1656b18a4f6780b64b3bccb31dd20e4839ec6fdc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:19:58 +0200 Subject: [PATCH 1/3] rofi-pass: use `makeBinaryWrapper` --- pkgs/tools/security/pass/rofi-pass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 4e5bdeb34a14..b49e3f5d1856 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, unstableGitUpdater, coreutils, util-linux, @@ -41,7 +41,7 @@ stdenv.mkDerivation { hash = "sha256-1lPNj47vTPLBK7mVm+PngV8C/ZsjJ2EN4ffXGU2TlQo="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; dontBuild = true; From 73b6bea9e1f725582db2b36cf744a26c99b9f0e5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:21:14 +0200 Subject: [PATCH 2/3] rofi-pass: add missing phase hooks --- pkgs/tools/security/pass/rofi-pass.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b49e3f5d1856..7b323436e0a3 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -46,11 +46,15 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -a rofi-pass $out/bin/rofi-pass mkdir -p $out/share/doc/rofi-pass/ cp -a config.example $out/share/doc/rofi-pass/config.example + + runHook postInstall ''; wrapperPath = lib.makeBinPath ( @@ -78,6 +82,8 @@ stdenv.mkDerivation { ); fixupPhase = '' + runHook preFixup + patchShebangs $out/bin wrapProgram $out/bin/rofi-pass \ @@ -86,6 +92,8 @@ stdenv.mkDerivation { --set-default ROFI_PASS_CLIPBOARD_BACKEND ${ if backend == "wayland" then "wl-clipboard" else "xclip" } + + runHook postFixup ''; passthru.updateScript = unstableGitUpdater { }; From cb0bf42e7e0960ba9623365c0f8e11af6809f201 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 11 Sep 2025 08:22:03 +0200 Subject: [PATCH 3/3] rofi-pass: replace `util-linux` with `util-linuxMinimal` --- pkgs/tools/security/pass/rofi-pass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 7b323436e0a3..029dfb9cf37c 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -5,7 +5,7 @@ makeBinaryWrapper, unstableGitUpdater, coreutils, - util-linux, + util-linuxMinimal, gnugrep, libnotify, pwgen, @@ -67,7 +67,7 @@ stdenv.mkDerivation { libnotify pwgen rofi - util-linux + util-linuxMinimal ] ++ lib.optionals (backend == "x11") [ (pass.withExtensions (ext: [ ext.pass-otp ]))