Merge pull request #45495 from danieldk/pass-darwin
pass: Fix dependencies on Darwin
This commit is contained in:
commit
8834b2868b
1 changed files with 7 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, pkgs, fetchurl, buildEnv
|
||||
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
|
||||
, makeWrapper
|
||||
, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps
|
||||
, qrencode , makeWrapper
|
||||
|
||||
, xclip ? null, xdotool ? null, dmenu ? null
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
|
@ -66,7 +66,8 @@ let
|
|||
which
|
||||
qrencode
|
||||
procps
|
||||
] ++ ifEnable x11Support [ dmenu xclip xdotool ]);
|
||||
] ++ optional stdenv.isDarwin openssl
|
||||
++ ifEnable x11Support [ dmenu xclip xdotool ]);
|
||||
|
||||
postFixup = ''
|
||||
# Link extensions env
|
||||
|
@ -97,6 +98,9 @@ let
|
|||
-e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
|
||||
-e '/which gpg/ d' \
|
||||
tests/setup.sh
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# 'pass edit' uses hdid, which is not available from the sandbox.
|
||||
rm -f tests/t0200-edit-tests.sh
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
|
Loading…
Reference in a new issue