diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-10-25 17:53:44 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-10-25 17:53:44 +0000 |
commit | 6582f602c994784a25afbc750ac9d478b7c3a8d4 (patch) | |
tree | 98cced5a635f72adc2a0bf3d35bcc21cfe3f6595 /pkgs/development/libraries | |
parent | faafa3513a37df0f989b35ff4c2e2f6e23c90d6b (diff) | |
download | nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar.gz nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar.bz2 nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar.lz nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar.xz nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.tar.zst nixpkgs-6582f602c994784a25afbc750ac9d478b7c3a8d4.zip |
Updating gnutls, as it failed on 'make test' on arm. The new does not fail.
svn path=/nixpkgs/trunk/; revision=30021
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 39532c075d1..888a119bb36 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; |