diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-19 20:58:56 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-19 20:58:56 +0000 |
commit | d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458 (patch) | |
tree | b1d9368082112c05c50d55e7f6ccb774a9a61d25 /pkgs/tools/security/gnupg/default.nix | |
parent | ea1953d7445ac719db975e6bdaf84e381c6f9803 (diff) | |
download | nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.gz nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.bz2 nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.lz nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.xz nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.zst nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.zip |
Mass GnuPG upgrade
gnupg tests fail. Will try to fix later. svn path=/nixpkgs/trunk/; revision=21884
Diffstat (limited to 'pkgs/tools/security/gnupg/default.nix')
-rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 2312d3ff06d6..32632358c251 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional useUsb libusb ++ stdenv.lib.optional useCurl curl; - patchPhase = "sed -e 's@/bin/pwd@pwd@g' -i tests/pkits/*"; + patchPhase = '' + find tests -type f | xargs sed -e 's@/bin/pwd@${stdenv.coreutils}&@g' -i + ''; + + checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; postInstall = '' ln -s gpg2 $out/bin/gpg |