diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-17 10:04:32 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-17 10:04:32 +0100 |
| commit | ee994dfae6e897ee4e7405e1624be43625086622 (patch) | |
| tree | dfc91b685425c8aca957d99a202729b4b956f37e | |
| parent | 0fe58cade5e90896dfafc49bd0c8cf89c5160fd3 (diff) | |
bootstrap tools: have curl without http2 support
I assume there's not much use for it during bootstrapping.
This fixes them as well, as curl was compiled against libnghttp2 but the
lib wasn't copied to the bootstrap tools.
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e31fed39843d..7f7f4c6a2bd1 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -11,6 +11,7 @@ rec { }); curlMinimal = curl.override { + http2Support = false; zlibSupport = false; sslSupport = false; scpSupport = false; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 01f013275d38..910d86066d9a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libnghttp2, pkgconfig, perl +{ stdenv, fetchurl, pkgconfig, perl +, http2Support ? true, libnghttp2 , idnSupport ? false, libidn ? null , ldapSupport ? false, openldap ? null , zlibSupport ? false, zlib ? null @@ -8,6 +9,7 @@ , c-aresSupport ? false, c-ares ? null }: +assert http2Support -> libnghttp2 != null; assert idnSupport -> libidn != null; assert ldapSupport -> openldap != null; assert zlibSupport -> zlib != null; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. propagatedBuildInputs = with stdenv.lib; - [ libnghttp2 ] ++ + optional http2Support libnghttp2 ++ optional idnSupport libidn ++ optional ldapSupport openldap ++ optional zlibSupport zlib ++ @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" - "--with-nghttp2=${libnghttp2}" + ( 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" ) |