2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
new file mode 100644
index 000000000000..be6d184a4f2c
--- /dev/null
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
+
+stdenv.mkDerivation rec {
+  name = "dirmngr-1.0.3";
+  src = fetchurl {
+    url = "mirror://gnupg/${name}.tar.bz2";
+    sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
+  };
+
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
+}
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