MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "curl: wrap binary so it can find the zlib dylib"

Browse source 
This reverts commit b4a5a049d8.
This commit is contained in:
John Wiegley 2015-01-06 10:35:55 -06:00
parent 7cd3ace827
commit b63caa13b3
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/networking/curl/default.nix
View file

@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
rm src/tool_hugehelp.c
'' ++ stdenv.lib.optionalString stdenv.isDarwin '';
export DYLD_LIBRARY_PATH=${zlib}/lib:$DYLD_LIBRARY_PATH
'';
# make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
@ -43,19 +41,12 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
( if zlibSupport then "--with-zlib=${zlib}" else "--without-zlib" )
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${zlib}/lib"
done
'';
CXX = "g++";
CXXCPP = "g++ -E";