Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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.

+6 -3
+1
pkgs/stdenv/linux/make-bootstrap-tools.nix
··· 11 11 }); 12 12 13 13 curlMinimal = curl.override { 14 + http2Support = false; 14 15 zlibSupport = false; 15 16 sslSupport = false; 16 17 scpSupport = false;
+5 -3
pkgs/tools/networking/curl/default.nix
··· 1 - { stdenv, fetchurl, libnghttp2, pkgconfig, perl 1 + { stdenv, fetchurl, pkgconfig, perl 2 + , http2Support ? true, libnghttp2 2 3 , idnSupport ? false, libidn ? null 3 4 , ldapSupport ? false, openldap ? null 4 5 , zlibSupport ? false, zlib ? null ··· 8 9 , c-aresSupport ? false, c-ares ? null 9 10 }: 10 11 12 + assert http2Support -> libnghttp2 != null; 11 13 assert idnSupport -> libidn != null; 12 14 assert ldapSupport -> openldap != null; 13 15 assert zlibSupport -> zlib != null; ··· 29 31 # "-lz -lssl", which aren't necessary direct build inputs of 30 32 # applications that use Curl. 31 33 propagatedBuildInputs = with stdenv.lib; 32 - [ libnghttp2 ] ++ 34 + optional http2Support libnghttp2 ++ 33 35 optional idnSupport libidn ++ 34 36 optional ldapSupport openldap ++ 35 37 optional zlibSupport zlib ++ ··· 47 49 configureFlags = [ 48 50 "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" 49 51 "--disable-manual" 50 - "--with-nghttp2=${libnghttp2}" 52 + ( if http2Support then "--with-nghttp2=${libnghttp2}" else "--without-nghttp2" ) 51 53 ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) 52 54 ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) 53 55 ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )