git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66506 from nh2/fetchurl-dont-force-set-gssSupport

fetchurl: Don't force-override curl's gssSupport to on unnecessarily

commit47fa2f133dec6842c7fea867ef948c8f8c614117 authorSilvan Mosberger <contact@infinisil.com> dateTue 13 Aug 2019, 01:04 (7 years ago) parentc78feadb7dfc72
1 file changed+8−3
pkgs/top-level/all-packages.nix+8−3
pkgs/top-level/all-packages.nix+8−3
@@ -275,7 +275,7 @@ in
275275 # `fetchurl' downloads a file from the network.
276276 fetchurl = makeOverridable (import ../build-support/fetchurl) {
277277 inherit lib stdenvNoCC;
278− curl = buildPackages.curl.override rec {
278+ curl = buildPackages.curl.override (old: rec {
279279 # break dependency cycles
280280 fetchurl = stdenv.fetchurlBoot;
281281 zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
@@ -292,7 +292,12 @@ in
292292 };
293293 # On darwin, libkrb5 needs bootstrap_cmds which would require
294294 # converting many packages to fetchurl_boot to avoid evaluation cycles.
295− gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows;
295+ # So turn gssSupport off there, and on Windows.
296+ # On other platforms, keep the previous value.
297+ gssSupport =
298+ if stdenv.isDarwin || stdenv.hostPlatform.isWindows
299+ then false
300+ else old.gssSupport or true; # `? true` is the default
296301 libkrb5 = buildPackages.libkrb5.override {
297302 fetchurl = stdenv.fetchurlBoot;
298303 inherit pkgconfig perl openssl;
@@ -304,7 +309,7 @@ in
304309 c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
305310 libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
306311 };
307− };
312+ });
308313 };
309314
310315 fetchRepoProject = callPackage ../build-support/fetchrepoproject { };