mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 16:40:12 +00:00
Code Issues Wiki Activity

Merge #32165: curlFull: add brotli support

Browse source
This commit is contained in:
Vladimír Čunát 2017-11-29 22:36:47 +01:00
parent 703a9f93c1 8d479c0397
commit a8f3df29c6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/networking/curl/default.nix
View file

@ -8,6 +8,7 @@
, scpSupport ? false, libssh2 ? null , scpSupport ? false, libssh2 ? null
, gssSupport ? false, gss ? null , gssSupport ? false, gss ? null
, c-aresSupport ? false, c-ares ? null , c-aresSupport ? false, c-ares ? null
, brotliSupport ? false, brotli ? null
}: }:
assert http2Support -> nghttp2 != null; assert http2Support -> nghttp2 != null;
@ -19,6 +20,7 @@ assert !(gnutlsSupport && sslSupport);
assert gnutlsSupport -> gnutls != null; assert gnutlsSupport -> gnutls != null;
assert scpSupport -> libssh2 != null; assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null; assert c-aresSupport -> c-ares != null;
assert brotliSupport -> brotli != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.57.0"; name = "curl-7.57.0";
@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
optional c-aresSupport c-ares ++ optional c-aresSupport c-ares ++
optional sslSupport openssl ++ optional sslSupport openssl ++
optional gnutlsSupport gnutls ++ optional gnutlsSupport gnutls ++
optional scpSupport libssh2; optional scpSupport libssh2 ++
optional brotliSupport brotli;
# for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
preConfigure = '' preConfigure = ''
@ -64,6 +67,7 @@ stdenv.mkDerivation rec {
( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
( if brotliSupport then "--with-brotli" else "--without-brotli" )
] ]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";

1
pkgs/top-level/all-packages.nix
View file

@ -1639,6 +1639,7 @@ with pkgs;
idnSupport = true; idnSupport = true;
ldapSupport = true; ldapSupport = true;
gssSupport = true; gssSupport = true;
brotliSupport = true;
}; };
curl = callPackage ../tools/networking/curl rec { curl = callPackage ../tools/networking/curl rec {