Skip to content

Commit

Permalink
darwin stdenv boostrap tools: use curl without kerberos
Browse files Browse the repository at this point in the history
/cc #29785.  Otherwise we would have to put the lib in, etc.
  • Loading branch information
vcunat committed Dec 24, 2017
1 parent d54ff36 commit ced4e5a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkgs/stdenv/darwin/make-bootstrap-tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ced4e5a

Please sign in to comment.