Author: simons
Date: Fri Aug 6 12:45:39 2010
New Revision: 22997
URL: https://svn.nixos.org/websvn/nix/?rev=22997&sc=1
Log:
pkgs/tools/networking/curl: strip trailing whitespace
Modified:
nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Fri Aug 6
12:45:11 2010 (r22996)
+++ nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Fri Aug 6
12:45:39 2010 (r22997)
@@ -11,19 +11,19 @@
stdenv.mkDerivation rec {
name = "curl-7.21.0";
-
+
src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2";;
sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
};
-
+
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
# "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl.
propagatedBuildInputs =
stdenv.lib.optional zlibSupport zlib ++
stdenv.lib.optional sslSupport openssl;
-
+
configureFlags = ''
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
@@ -31,7 +31,7 @@
'';
dontDisableStatic = if linkStatic then true else false;
-
+
CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
LDFLAGS = if linkStatic then "-static" else "";
CXX = "g++";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
