public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58283 from dylex/bootzlib

Browse Source 
fetchurl: use fetchurlBoot for zlib deps
This commit is contained in:
Matthew Bauer 2019-03-26 14:13:18 -04:00 committed by GitHub
commit e8c84d3449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/tools/networking/curl/default.nix
View File

@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
moveToOutput bin/curl-config "$dev" moveToOutput bin/curl-config "$dev"
'' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport '' '' + stdenv.lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so

5
pkgs/top-level/all-packages.nix
View File

@ -256,6 +256,7 @@ in
curl = buildPackages.curl.override rec { curl = buildPackages.curl.override rec {
# break dependency cycles # break dependency cycles
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override { openssl = buildPackages.openssl.override {
@ -265,7 +266,7 @@ in
}; };
libssh2 = buildPackages.libssh2.override { libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
inherit openssl; inherit zlib openssl;
}; };
# On darwin, libkrb5 needs bootstrap_cmds which would require # On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles. # converting many packages to fetchurl_boot to avoid evaluation cycles.
@ -277,7 +278,7 @@ in
}; };
nghttp2 = buildPackages.nghttp2.override { nghttp2 = buildPackages.nghttp2.override {
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
inherit pkgconfig openssl; inherit zlib pkgconfig openssl;
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
}; };