bootstrap tools: have curl without http2 support

lol

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.

Vladimír Čunát 10 years ago ee994dfa 0fe58cad

+6 -3

2 changed files

expand all

unified split

pkgs

stdenv

linux

make-bootstrap-tools.nix

tools

networking

curl

default.nix

pkgs/stdenv/linux/make-bootstrap-tools.nix

··· 11 }); 12 13 curlMinimal = curl.override { 14 zlibSupport = false; 15 sslSupport = false; 16 scpSupport = false;

··· 11 }); 12 13 curlMinimal = curl.override { 14 + http2Support = false; 15 zlibSupport = false; 16 sslSupport = false; 17 scpSupport = false;

+5 -3

pkgs/tools/networking/curl/default.nix

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

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