3
0
Fork 0
forked from mirrors/nixpkgs

Add libassuan1 back

opensc needs it

svn path=/nixpkgs/trunk/; revision=21887
This commit is contained in:
Yury G. Kudryashov 2010-05-19 20:59:15 +00:00
parent b7a54122ef
commit 6a0318fead
3 changed files with 36 additions and 4 deletions

View file

@ -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+";
};
}

View file

@ -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;

View file

@ -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;
};