pass: Fix dependencies on Darwin

password-store on Darwin does not pass unit tests in sandboxed
builds:

- 'openssl base64' is used on Darwin to compute base64. Add openssl
  to the environment of pass.
- t0200-edit-tests.sh tests 'pass edit', which uses hdid on Darwin.
  However hdid is not available in the sandbox.
wip/yesman
Daniël de Kok 6 years ago
parent 903306a74d
commit c9c3663d3e
  1. 10
      pkgs/tools/security/pass/default.nix

@ -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…
Cancel
Save