cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #112947 from SuperSandro2000/curl-brotli

Browse source 
curl: enable brotli by default
This commit is contained in:
Sandro 2021-03-08 02:30:32 +01:00 committed by GitHub
commit 9fe654a203
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkg-config { stdenv, lib, fetchurl, pkg-config
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages , buildPackages
# darwin attributes # darwin attributes
, ps , ps
@ -50,7 +50,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ setupHook pkg-config ]; nativeBuildInputs = [ setupHook pkg-config ];
buildInputs = [] buildInputs = []
++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl ++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses ++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4 ++ lib.optional useQt4 qt4

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

@ -417,7 +417,7 @@ in
else makeOverridable (import ../build-support/fetchurl) { else makeOverridable (import ../build-support/fetchurl) {
inherit lib stdenvNoCC buildPackages; inherit lib stdenvNoCC buildPackages;
inherit cacert; inherit cacert;
curl = buildPackages.curl.override (old: rec { curl = buildPackages.curlMinimal.override (old: rec {
# break dependency cycles # break dependency cycles
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
@ -3522,13 +3522,16 @@ in
cudnn = cudnn_cudatoolkit_10; cudnn = cudnn_cudatoolkit_10;
curlFull = curl.override { curlFull = curl.override {
idnSupport = true;
ldapSupport = true; ldapSupport = true;
};
curl = curlMinimal.override {
idnSupport = true;
gssSupport = true; gssSupport = true;
brotliSupport = true; brotliSupport = true;
}; };
curl = callPackage ../tools/networking/curl { }; curlMinimal = callPackage ../tools/networking/curl { };
curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };