public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/tools/networking/curl: strip trailing whitespace

Browse Source 
svn path=/nixpkgs/trunk/; revision=22997
This commit is contained in:
Peter Simons 2010-08-06 12:45:39 +00:00
parent 432ad9ceef
commit 0571d80df6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/curl/default.nix
View File

@ -11,19 +11,19 @@ assert scpSupport -> libssh2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.21.0"; name = "curl-7.21.0";
src = fetchurl { src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2"; url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy"; sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
}; };
# Zlib and OpenSSL must be propagated because `libcurl.la' contains # Zlib and OpenSSL must be propagated because `libcurl.la' contains
# "-lz -lssl", which aren't necessary direct build inputs of # "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl. # applications that use Curl.
propagatedBuildInputs = propagatedBuildInputs =
stdenv.lib.optional zlibSupport zlib ++ stdenv.lib.optional zlibSupport zlib ++
stdenv.lib.optional sslSupport openssl; stdenv.lib.optional sslSupport openssl;
configureFlags = '' configureFlags = ''
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"} ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
''; '';
dontDisableStatic = if linkStatic then true else false; dontDisableStatic = if linkStatic then true else false;
CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
LDFLAGS = if linkStatic then "-static" else ""; LDFLAGS = if linkStatic then "-static" else "";
CXX = "g++"; CXX = "g++";