public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Vladimír Čunát 2016-02-17 10:04:32 +01:00
parent 0fe58cade5
commit ee994dfae6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -11,6 +11,7 @@ rec {
}); });
curlMinimal = curl.override { curlMinimal = curl.override {
http2Support = false;
zlibSupport = false; zlibSupport = false;
sslSupport = false; sslSupport = false;
scpSupport = false; scpSupport = false;

8
pkgs/tools/networking/curl/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libnghttp2, pkgconfig, perl { stdenv, fetchurl, pkgconfig, perl
, http2Support ? true, libnghttp2
, idnSupport ? false, libidn ? null , idnSupport ? false, libidn ? null
, ldapSupport ? false, openldap ? null , ldapSupport ? false, openldap ? null
, zlibSupport ? false, zlib ? null , zlibSupport ? false, zlib ? null
@ -8,6 +9,7 @@
, c-aresSupport ? false, c-ares ? null , c-aresSupport ? false, c-ares ? null
}: }:
assert http2Support -> libnghttp2 != null;
assert idnSupport -> libidn != null; assert idnSupport -> libidn != null;
assert ldapSupport -> openldap != null; assert ldapSupport -> openldap != null;
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
# "-lz -lssl", which aren't necessary direct build inputs of # "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl. # applications that use Curl.
propagatedBuildInputs = with stdenv.lib; propagatedBuildInputs = with stdenv.lib;
[ libnghttp2 ] ++ optional http2Support libnghttp2 ++
optional idnSupport libidn ++ optional idnSupport libidn ++
optional ldapSupport openldap ++ optional ldapSupport openldap ++
optional zlibSupport zlib ++ optional zlibSupport zlib ++
@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
"--disable-manual" "--disable-manual"
"--with-nghttp2=${libnghttp2}" ( if http2Support then "--with-nghttp2=${libnghttp2}" else "--without-nghttp2" )
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )