* A function `useDietLibC' that returns a modified stdenv that uses

  dietlibc to produce small, statically linked binaries.  This stdenv
  also passes `-Os' to GCC automatically to optimise for size.  It
  also tries to prevent builders from linking against dynamic
  libraries (which dietlibc doesn't support).

* A function `addAttrsToDerivation' that returns a modified stdenv
  that always adds the specified attributes to the derivations that it
  produces.  Example (from curl):

    curlDiet =  import ../tools/networking/curl {
      inherit fetchurl zlib;
      stdenv = addAttrsToDerivation {
        CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
      } (useDietLibC stdenv);
    };

  (This is needed to get curl to build with dietlibc.  Also note the
  stacking of stdenv-modifying functions.)

* curl-diet: no longer necessary.

svn path=/nixpkgs/trunk/; revision=6761

4 files changed, 3 insertions, 48 deletions

diff --git a/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch b/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch
deleted file mode 100644
index 5b8bc85cb15d6..0000000000000
--- a/pkgs/tools/networking/curl-diet/configure-cxxcpp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index c72bde1950490..0000000000000
--- a/pkgs/tools/networking/curl-diet/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null, dietgcc}:
-
-assert sslSupport -> openssl != null;
-
-stdenv.mkDerivation {
-  name = "curl-7.15.5";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
-    md5 = "594142c7d53bbdd988e8cef6354eeeff";
-  };
-  buildInputs = [zlib (if sslSupport then openssl else null)];
-  patches = [./configure-cxxcpp.patch];
-  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";
-}
diff --git a/pkgs/tools/networking/curl/builder.sh b/pkgs/tools/networking/curl/builder.sh
deleted file mode 100644
index dd693683cb0d8..0000000000000
--- a/pkgs/tools/networking/curl/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-if test "$sslSupport"; then
-  configureFlags="--with-ssl=$openssl"
-else
-  configureFlags="--without-ssl"
-fi
-
-genericBuild
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 71cfc6e4e1490..f05194e7b2ca2 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -4,12 +4,14 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
   name = "curl-7.15.5";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
     md5 = "594142c7d53bbdd988e8cef6354eeeff";
   };
   buildInputs = [zlib (if sslSupport then openssl else null)];
   patches = [./configure-cxxcpp.patch];
+  configureFlags = "
+    ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
+  ";
   inherit sslSupport openssl;
 }