From fd63f04e4e972f0ff8a4e70527dc8e4f8595b603 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 19 May 2010 20:59:03 +0000
Subject: [PATCH] Remove gpg->gpg2 symlink

Also make gpgme compile&find gpg2

svn path=/nixpkgs/trunk/; revision=21885
---
 pkgs/development/libraries/gpgme/default.nix | 5 +++--
 pkgs/tools/security/gnupg/default.nix        | 5 -----
 pkgs/top-level/all-packages.nix              | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 3ca0e974ff15..42a592bf2dcc 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}:
+{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan}:
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.3.0";
@@ -6,5 +6,6 @@ stdenv.mkDerivation rec {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
     sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
   };
-  buildInputs = [libgpgerror gnupg pkgconfig glib pth];
+  buildInputs = [libgpgerror gnupg pkgconfig glib pth libassuan];
+  configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
 }
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 32632358c251..1da3e4e51a22 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -31,11 +31,6 @@ stdenv.mkDerivation rec {
 
   checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
 
-  postInstall = ''
-    ln -s gpg2 $out/bin/gpg
-    ln -s gpgv2 $out/bin/gpgv
-  '';
-
   doCheck = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3f50d6b5f8e..5c32d40b4493 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4034,7 +4034,7 @@ let
   };
 
   gpgme = import ../development/libraries/gpgme {
-    inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg glib;
+    inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg glib libassuan;
   };
 
   gsasl = import ../development/libraries/gsasl {