rbw: fix build on darwin

This commit is contained in:
Mario Rodas 2020-10-01 04:20:00 +00:00
parent d3669570d2
commit 56f9e7571c
2 changed files with 8 additions and 3 deletions

View file

@ -1,11 +1,12 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, pinentry
, openssl
, pkgconfig
, makeWrapper
, cargo
, Security
# rbw-fzf
, withFzf ? false, fzf, perl
@ -34,9 +35,11 @@ rustPlatform.buildRustPackage rec {
makeWrapper
];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
postPatch = ''
substituteInPlace src/pinentry.rs \
--replace "Command::new(\"pinentry\")" "Command::new(\"${pinentry}/bin/pinentry\")"
--replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")'
'' + lib.optionalString withFzf ''
patchShebangs bin/rbw-fzf
substituteInPlace bin/rbw-fzf \

View file

@ -6465,7 +6465,9 @@ in
pywal = with python3Packages; toPythonApplication pywal;
rbw = callPackage ../tools/security/rbw { };
rbw = callPackage ../tools/security/rbw {
inherit (darwin.apple_sdk.frameworks) Security;
};
remarshal = callPackage ../development/tools/remarshal { };