Revert "curl: Improve .pc and .la patching"

This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73ce084275d748be26887cf4023c91d6.

Shea Levy f168973b dc1107af

+10 -16
+10 -16
pkgs/tools/networking/curl/default.nix
··· 103 103 ]; 104 104 105 105 # Fix all broken refernces to dependencies in .la and .pc files 106 - postInstall = '' 107 - sed -i \ 108 - '' + optionalString (optZlib != null) '' 109 - -e 's,\(-lz\),-L${optZlib}/lib \1,' \ 106 + postInstall = optionalString (optZlib != null) '' 107 + sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 110 108 '' + optionalString (optOpenssl != null) '' 111 - -e 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' \ 109 + sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc 112 110 '' + optionalString (optLibssh2 != null) '' 113 - -e 's,\(-lssh2\),-L${optLibssh2}/lib \1,' \ 111 + sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc 114 112 '' + optionalString (optLibnghttp2 != null) '' 115 - -e 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' \ 113 + sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc 116 114 '' + optionalString (optC-ares != null) '' 117 - -e 's,\(-lcares\),-L${optC-ares}/lib \1,' \ 115 + sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 118 116 '' + optionalString (optGss != null) '' 119 - -e 's,\(-lgss\),-L${optGss}/lib \1,' \ 117 + sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 120 118 '' + optionalString (optRtmpdump != null) '' 121 - -e 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' \ 119 + sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc 122 120 '' + optionalString (optOpenldap != null) '' 123 - -e 's,\(-lgss\),-L${optOpenldap}/lib \1,' \ 121 + sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 124 122 '' + optionalString (optLibidn != null) '' 125 - -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \ 126 - '' + optionalString (!stdenv.isDarwin) '' 127 - $out/lib/libcurl.la \ 128 - '' + '' 129 - $out/lib/pkgconfig/libcurl.pc 123 + sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc 130 124 ''; 131 125 132 126 meta = {