From 69b0f364587e99f9c9b246af350b8152603c93d9 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 5 Sep 2005 11:35:26 +0000 Subject: [PATCH] don't forget curl-diet itself, d'oh! svn path=/nixpkgs/trunk/; revision=3776 --- .../curl-diet/configure-cxxcpp.patch | 21 +++++++++++++++++++ pkgs/tools/networking/curl-diet/default.nix | 18 ++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/curl-diet/configure-cxxcpp.patch create mode 100644 pkgs/tools/networking/curl-diet/default.nix diff --git a/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch b/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch new file mode 100644 index 00000000000..5b8bc85cb15 --- /dev/null +++ b/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch @@ -0,0 +1,21 @@ +diff -ruN curl-7.12.2/configure curl-7.12.2-new/configure +--- curl-7.12.2/configure 2004-10-18 00:22:10.000000000 +0200 ++++ curl-7.12.2-new/configure 2004-12-09 13:58:57.670095179 +0100 +@@ -6835,11 +6835,12 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ #{ { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++#See \`config.log' for more details." >&5 ++#echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++#See \`config.log' for more details." >&2;} ++ #{ (exit 1); exit 1; }; } ++ : + fi + + ac_ext=cc diff --git a/pkgs/tools/networking/curl-diet/default.nix b/pkgs/tools/networking/curl-diet/default.nix new file mode 100644 index 00000000000..ce8623c4d2d --- /dev/null +++ b/pkgs/tools/networking/curl-diet/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null, dietgcc}: + +assert sslSupport -> openssl != null; + +stdenv.mkDerivation { + name = "curl-7.14.1"; + src = fetchurl { + url = http://curl.haxx.se/download/curl-7.14.1.tar.bz2; + md5 = "8b8723f3c0e7acfb30c5215e6cffde32"; + }; + buildInputs = [zlib (if sslSupport then openssl else null)]; + patches = [./configure-cxxcpp.patch]; + #configureFlags = (if sslSupport then "--with-ssl" else "--without-ssl"); + configureFlags = "--enable-shared=no" + (if sslSupport then "--with-ssl" else "--without-ssl"); + NIX_GCC = dietgcc; + NIX_GLIBC_FLAGS_SET=1; + NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1 -DHAVE_INET_NTOA_R_2_ARGS=1"; +}