diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-18 20:42:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-18 21:13:18 +0200 |
| commit | b4bf4327097265d855ad04f09759bd2eeb73aed1 (patch) | |
| tree | 6446870bcaab983e69460a8dbfc4966cca683348 /pkgs/tools/networking/curl | |
| parent | 21a2f2ba3bc8962845f0b45cacac4e47557ebf13 (diff) | |
| download | nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar.gz nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar.bz2 nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar.lz nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar.xz nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.tar.zst nixlib-b4bf4327097265d855ad04f09759bd2eeb73aed1.zip | |
nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs
Note: I ignored the C++ libraries, but it appears we're not currently using them. Once we do, we'll probably want to put them in a separate output as well (to prevent non-C++ users from depending on Boost).
Diffstat (limited to 'pkgs/tools/networking/curl')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 6008afa27872..47f03cc37477 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl -, http2Support ? true, libnghttp2 +, http2Support ? true, nghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null , zlibSupport ? false, zlib ? null @@ -9,7 +9,7 @@ , c-aresSupport ? false, c-ares ? null }: -assert http2Support -> libnghttp2 != null; +assert http2Support -> nghttp2 != null; assert idnSupport -> libidn != null; assert ldapSupport -> openldap != null; assert zlibSupport -> zlib != null; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. propagatedBuildInputs = with stdenv.lib; - optional http2Support libnghttp2 ++ + optional http2Support nghttp2 ++ optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" - ( if http2Support then "--with-nghttp2=${libnghttp2}" else "--without-nghttp2" ) ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) |