From 7008b7e0154709542f941347182df86fb3e12b35 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 11 Mar 2021 04:20:00 +0000 Subject: [PATCH] rbw: remove pinentry substitution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since rbw≥1.1.0 pinentry is configured trough `rbw config`. --- pkgs/tools/security/rbw/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 9f19a34c162c..c1f99719d76c 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchCrate -, pinentry , openssl , pkg-config , makeWrapper @@ -40,10 +39,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; - postPatch = '' - substituteInPlace src/pinentry.rs \ - --replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")' - '' + lib.optionalString withFzf '' + postPatch = lib.optionalString withFzf '' patchShebangs bin/rbw-fzf substituteInPlace bin/rbw-fzf \ --replace fzf ${fzf}/bin/fzf \