diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-26 14:13:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 14:13:18 -0400 |
| commit | e8c84d3449c1def3a7ed0509d687d01ab44383fb (patch) | |
| tree | fdd3ab7453fd5c941e4b48d54450fefd1a3e5e48 /pkgs | |
| parent | ae024556c9a8714e58f0c67c5a0b6c0a818db527 (diff) | |
| parent | 1c3a4ef287a6c59db964e6e4de5fb88c9e1919dd (diff) | |
Merge pull request #58283 from dylex/bootzlib
fetchurl: use fetchurlBoot for zlib deps
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index b165142d85a..45ff2947c68 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/curl-config "$dev" + '' + stdenv.lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 044a369b065..8184ef58196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -256,6 +256,7 @@ in curl = buildPackages.curl.override rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; + zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { @@ -265,7 +266,7 @@ in }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; - inherit openssl; + inherit zlib openssl; }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. @@ -277,7 +278,7 @@ in }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig openssl; + inherit zlib pkgconfig openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; |