Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19654

pkgs/development/tools/misc/distcc/20-minute-io-timeout.patch

@@ -0,0 +1,12 @@
+diff -ubr distcc-3.1-orig/src/io.c distcc-3.1-patched/src/io.c
+--- distcc-3.1-orig/src/io.c	2008-12-02 22:50:25.000000000 +0100
++++ distcc-3.1-patched/src/io.c	2010-01-07 15:07:18.000000000 +0100
+@@ -64,7 +64,7 @@
+ 
+ /** Timeout for all IO other than opening connections.  Much longer, because
+  * compiling files can take a long time. **/
+-const int dcc_io_timeout = 300; /* seconds */
++const int dcc_io_timeout = 1200; /* seconds */
+ 
+ 
+ /**

pkgs/development/tools/misc/distcc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk}:
+{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, static ? false}:
 
 let name        = "distcc";
     version     = "3.1";
@@ -15,13 +15,15 @@ stdenv.mkDerivation {
   ''
     configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
                           CXXFLAGS="-O2 -fno-strict-aliasing"
-                          --with${if popt == null then "" else "out"}-included-popt
+                          ${if static then "LDFLAGS=-static" else ""}
+                          --with${if static == true || popt == null then "" else "out"}-included-popt
                           --with${if avahi != null then "" else "out"}-avahi
                           --with${if gtk != null then "" else "out"}-gtk
                           --without-gnome
                           --enable-rfc2553
                          )
   '';
+  patches = [ ./20-minute-io-timeout.patch ];
 
   # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
   doCheck = false;

pkgs/development/tools/misc/gengetopt/default.nix

@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "gengetopt-2.22.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gengetopt/${name}.tar.gz";
+    sha256 = "08a4wmzvin8ljdgw2c0mcz654h4hpzam2p43hsf951c0xhj6ppsf";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Gengetopt, a command-line option parser generator";
+
+    longDescription =
+      '' GNU Gengetopt program generates a C function that uses getopt_long
+         function to parse the command line options, to validate them and
+         fills a struct
+      '';
+
+    homepage = http://www.gnu.org/software/gengetopt/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}