diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-10-19 14:00:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-19 14:10:24 +0200 |
commit | 6f21c88ffcd38a34a61aec9226d720343218ba35 (patch) | |
tree | 1106722a7bc31ce5d5dd5e13f4ae19d1afc7b0a1 /pkgs/development/libraries/gnutls | |
parent | 1189d3fb2a53a051d96faee2d152cf8fe929e901 (diff) | |
download | nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar.gz nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar.bz2 nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar.lz nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar.xz nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.tar.zst nixpkgs-6f21c88ffcd38a34a61aec9226d720343218ba35.zip |
gnutls: update to 3.1.3
Diffstat (limited to 'pkgs/development/libraries/gnutls')
-rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 93f5dab537e..ee566d46b65 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,29 +5,29 @@ assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.0.22"; + name = "gnutls-3.1.3"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; + sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw"; }; - # FIXME: Turn into a Nix list. + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ --without-p11-kit \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-libnettle-prefix="${nettle}" \ + CPPFLAGS="-I${gmp}/include" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""}${if stdenv.isSunOS - # TODO: Use `--with-libnettle-prefix' on all platforms - # Note: GMP is a dependency of Nettle, whose public headers include - # GMP headers, hence the hack. - then " --with-libnettle-prefix=${nettle} CPPFLAGS=-I${gmp}/include" else ""} ''; + enableParallelBuilding = true; + buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; |