GnuTLS 2.8.6.

svn path=/nixpkgs/trunk/; revision=21710
This commit is contained in:
Ludovic Courtès 2010-05-10 14:30:52 +00:00
parent d1bca917cd
commit f64cc94638
2 changed files with 2 additions and 18 deletions

View file

@ -5,15 +5,13 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-2.8.5";
name = "gnutls-2.8.6";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.bz2";
sha256 = "1s6a2plds995q8rb8x19rz3c8v6xfqc4wvqqw01f6l8myyfw4jcj";
sha256 = "0mm3i2b6pvchx4cxgg0c2xkvflv9wz75vmpbk8nfxwsa0skldy6n";
};
patches = [ ./gnutls-cli-libgcrypt.patch ];
configurePhase = ''
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \

View file

@ -1,14 +0,0 @@
This patch is to make sure `gnutls-cli' is explicitly linked against
libgcrypt since it really needs to.
--- gnutls-2.8.5/src/Makefile.in 2009-11-02 11:36:01.000000000 +0100
+++ gnutls-2.8.5/src/Makefile.in 2009-11-06 23:30:42.000000000 +0100
@@ -840,6 +840,7 @@ libcmd_psk_la_CFLAGS =
libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
gnutls_cli_SOURCES = cli.c common.h common.c
gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
+ -lgcrypt \
libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB)
libcmd_cli_la_CFLAGS =
libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c