diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-24 23:07:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-24 23:07:37 +0000 |
| commit | 7d5de08c1c44f52b696c23871e4780f3b22602a6 (patch) | |
| tree | 1e10affafadbbb2edb6756a615955fdb052ffd3e /pkgs/tools/networking | |
| parent | 66fb5088c5ec65061787b8e2063ae8107c64409b (diff) | |
| download | nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar.gz nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar.bz2 nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar.lz nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar.xz nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.tar.zst nixlib-7d5de08c1c44f52b696c23871e4780f3b22602a6.zip | |
* More simplification.
svn path=/nixpkgs/trunk/; revision=6838
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 91584e8ea0be..ec72529af5db 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,7 +3,7 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "curl-7.15.5"; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2; @@ -16,11 +16,6 @@ stdenv.mkDerivation ({ configureFlags = " ${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; -} - -// (if stdenv ? isDietLibC then { - CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1"; -} else {}) - -) +} \ No newline at end of file |