diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 399c3c9e38c..65e1b553875 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config -, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes , ps @@ -50,7 +50,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ setupHook pkg-config ]; 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 useNcurses ncurses ++ lib.optional useQt4 qt4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3f7e5be60..6443e41ff62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,7 +417,7 @@ in else makeOverridable (import ../build-support/fetchurl) { inherit lib stdenvNoCC buildPackages; inherit cacert; - curl = buildPackages.curl.override (old: rec { + curl = buildPackages.curlMinimal.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; @@ -3522,13 +3522,16 @@ in cudnn = cudnn_cudatoolkit_10; curlFull = curl.override { - idnSupport = true; ldapSupport = true; + }; + + curl = curlMinimal.override { + idnSupport = true; gssSupport = true; brotliSupport = true; }; - curl = callPackage ../tools/networking/curl { }; + curlMinimal = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };