From b63caa13b3da56df09a0b33813f9cd5bb3eecd86 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 6 Jan 2015 10:35:55 -0600
Subject: [PATCH] Revert "curl: wrap binary so it can find the zlib dylib"

This reverts commit b4a5a049d814c73b9fc99f6f88fb723ba78662fb.
---
 pkgs/tools/networking/curl/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d635a83b0698..b54df60ef0a9 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -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";