public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GnuTLS' `openssl' test. 

svn path=/nixpkgs/trunk/; revision=12836
This commit is contained in:
Ludovic Courtès 2008-09-09 20:17:03 +00:00
parent be4bb6f4de
commit 884b8c42d3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1zg5ggf8raydr939glq5mwssly84c6czy1hi5gf00wwdhak0256r"; sha256 = "1zg5ggf8raydr939glq5mwssly84c6czy1hi5gf00wwdhak0256r";
}; };
patches = [ ./tmpdir.patch ]; patches = [ ./tmpdir.patch ./fix-openssl-test.patch ];
configurePhase = '' configurePhase = ''
./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site" ./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site"
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [libgcrypt]; propagatedBuildInputs = [libgcrypt];
doCheck = false; # disabled due to a bug between libgcrypt and gnutls doCheck = true;
meta = { meta = {
description = "The GNU Transport Layer Security Library"; description = "The GNU Transport Layer Security Library";

14
pkgs/development/libraries/gnutls/fix-openssl-test.patch Normal file
View File

@ -0,0 +1,14 @@
This patch fixes the `openssl' test.
See http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3050 .
--- a/tests/openssl.c
+++ b/tests/openssl.c
@@ -36,5 +36,8 @@ doit (void)
MD5_CTX c;
unsigned char md[MD5_DIGEST_LENGTH];
+ if (gnutls_global_init() != 0)
+ fail ("gnutls_global_init\n");
+
if (!gnutls_check_version (LIBGNUTLS_VERSION))
success ("gnutls_check_version ERROR\n");