Updating gnutls, as it failed on 'make test' on arm. The new does not fail.
svn path=/nixpkgs/trunk/; revision=30021
This commit is contained in:
parent
faafa3513a
commit
6582f602c9
|
@ -1,15 +1,15 @@
|
||||||
{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
|
{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
|
||||||
, guileBindings, guile }:
|
, guileBindings, guile, perl }:
|
||||||
|
|
||||||
assert guileBindings -> guile != null;
|
assert guileBindings -> guile != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
name = "gnutls-3.0.2";
|
name = "gnutls-3.0.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/gnutls/${name}.tar.xz";
|
url = "mirror://gnu/gnutls/${name}.tar.xz";
|
||||||
sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
|
sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3";
|
||||||
};
|
};
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
|
||||||
else ""}
|
else ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ xz zlib lzo ]
|
buildInputs = [ zlib lzo ]
|
||||||
++ stdenv.lib.optional guileBindings guile;
|
++ stdenv.lib.optional guileBindings guile;
|
||||||
|
|
||||||
|
buildNativeInputs = [ xz perl ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ nettle libtasn1 ];
|
propagatedBuildInputs = [ nettle libtasn1 ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
Loading…
Reference in New Issue