public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45495 from danieldk/pass-darwin

Browse Source 
pass: Fix dependencies on Darwin
This commit is contained in:
Jörg Thalheim 2018-08-23 10:26:44 +01:00 committed by GitHub
commit 8834b2868b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/security/pass/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, pkgs, fetchurl, buildEnv { stdenv, lib, pkgs, fetchurl, buildEnv
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps
, makeWrapper , qrencode , makeWrapper
, xclip ? null, xdotool ? null, dmenu ? null , xclip ? null, xdotool ? null, dmenu ? null
, x11Support ? !stdenv.isDarwin , x11Support ? !stdenv.isDarwin
@ -66,7 +66,8 @@ let
which which
qrencode qrencode
procps procps
] ++ ifEnable x11Support [ dmenu xclip xdotool ]); ] ++ optional stdenv.isDarwin openssl
++ ifEnable x11Support [ dmenu xclip xdotool ]);
postFixup = '' postFixup = ''
# Link extensions env # Link extensions env
@ -97,6 +98,9 @@ let
-e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
-e '/which gpg/ d' \ -e '/which gpg/ d' \
tests/setup.sh 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; doCheck = false;