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

* More simplification.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6838
This commit is contained in:
Eelco Dolstra 2006-10-24 23:07:37 +00:00
parent 66fb5088c5
commit 7d5de08c1c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
stdenv.mkDerivation ({ stdenv.mkDerivation {
name = "curl-7.15.5"; name = "curl-7.15.5";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2; url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
@ -16,11 +16,6 @@ stdenv.mkDerivation ({
configureFlags = " configureFlags = "
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
"; ";
CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
inherit sslSupport openssl; inherit sslSupport openssl;
} }
// (if stdenv ? isDietLibC then {
CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
} else {})
)