diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-12-26 21:10:12 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-12-26 21:10:12 +0200 |
| commit | 47c782f7f55ada3b787591924f30b5e9bff73460 (patch) | |
| tree | a989b897d841efe1e73719a917b5c55fee7531d1 /pkgs/stdenv/darwin | |
| parent | 696f3e702d0799361f13624f6609182a1d68cd17 (diff) | |
| parent | 4271a210b0ac9fbbea5382ddee1cfa835f3e35b9 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 5d5a3a81d44b..6fb37f249144 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -15,6 +15,9 @@ in rec { # Avoid debugging larger changes for now. bzip2_ = bzip2.override (args: { linkStatic = true; }); + # Avoid messing with libkrb5. + curl_ = curl.override (args: { gssSupport = false; }); + build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -60,8 +63,8 @@ in rec { # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static - cp ${curl.bin}/bin/curl $out/bin - cp -d ${curl.out}/lib/libcurl*.dylib $out/lib + cp ${curl_.bin}/bin/curl $out/bin + cp -d ${curl_.out}/lib/libcurl*.dylib $out/lib cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib cp -d ${openssl.out}/lib/*.dylib $out/lib |