From 6582f602c994784a25afbc750ac9d478b7c3a8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 17:53:44 +0000 Subject: [PATCH] Updating gnutls, as it failed on 'make test' on arm. The new does not fail. svn path=/nixpkgs/trunk/; revision=30021 --- pkgs/development/libraries/gnutls/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 39532c075d1a..888a119bb360 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle -, guileBindings, guile }: +, guileBindings, guile, perl }: assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.2"; + name = "gnutls-3.0.4"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii"; + sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3"; }; configurePhase = '' @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { else ""} ''; - buildInputs = [ xz zlib lzo ] + buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; + buildNativeInputs = [ xz perl ]; + propagatedBuildInputs = [ nettle libtasn1 ]; doCheck = true;