Add libassuan1 back

opensc needs it

svn path=/nixpkgs/trunk/; revision=21887

3 files changed, 36 insertions, 4 deletions

diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix
new file mode 100644
index 000000000000..9a161ec170f4
--- /dev/null
+++ b/pkgs/development/libraries/libassuan1/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv, pth }:
+
+stdenv.mkDerivation rec {
+  name = "libassuan-1.0.5";
+
+  src = fetchurl {
+    url = "mirror://gnupg/libassuan/${name}.tar.bz2";
+    sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5";
+  };
+
+  propagatedBuildInputs = [ pth ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Libassuan, the IPC library used by GnuPG and related software";
+
+    longDescription = ''
+      Libassuan is a small library implementing the so-called Assuan
+      protocol.  This protocol is used for IPC between most newer
+      GnuPG components.  Both, server and client side functions are
+      provided.
+    '';
+
+    homepage = http://gnupg.org;
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix
index af0bc5144a87..e18858363013 100644
--- a/pkgs/tools/security/opensc/0.11.7.nix
+++ b/pkgs/tools/security/opensc/0.11.7.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, libassuan, pkgconfig,
-libXt, pinentry}:
+{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite,
+  libassuan1, pkgconfig, libXt, pinentry}:
 
 stdenv.mkDerivation rec {
   name = "opensc-0.11.7";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
     "--with-pinentry=${pinentry}/bin/pinentry" ];
 
-  buildInputs = [ libtool readline zlib openssl pcsclite libassuan pkgconfig
+  buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig
     libXt ] ++
     stdenv.lib.optional (! stdenv.isLinux) libiconv;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9826045d365..6f3e365cd2d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1275,7 +1275,7 @@ let
 
   opensc_0_11_7 = import ../tools/security/opensc/0.11.7.nix {
     inherit fetchurl stdenv libtool readline zlib openssl libiconv pcsclite
-      libassuan pkgconfig pinentry;
+      libassuan1 pkgconfig pinentry;
     inherit (xlibs) libXt;
   };
 
@@ -4304,6 +4304,10 @@ let
       openssl attr;
   };
 
+  libassuan1 = import ../development/libraries/libassuan1 {
+    inherit fetchurl stdenv pth;
+  };
+
   libassuan = import ../development/libraries/libassuan {
     inherit fetchurl stdenv pth libgpgerror;
   };