* dhcp updated to 4.1.0p1. This seems to fix my problems with

wpa_supplicant (i.e. the dhclient-script no longer brings down the
  wlan0 interface).  The patches no longer seem needed.

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

pkgs/tools/networking/dhcp/default.nix

@@ -1,22 +1,28 @@
-{ stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused,
-  bash, makeWrapper }:
+{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "dhcp-3.0.6";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "dhcp-4.1.0p1";
+  
   src = fetchurl {
-    url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.6.tar.gz;
-    sha256 = "0k8gy3ab9kzs4qcc9apgnxi982lhggha41fkw9w1bmvmz7mv0xwz";
+    url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz";
+    sha256 = "0il966bcls7nfd93qfqrgvd2apkm0kv7pk35lnl1nvbm7fyrik7z";
   };
 
-  buildInputs = [ groff nettools coreutils makeWrapper ];
+  # Fixes "socket.c:591: error: invalid application of 'sizeof' to
+  # incomplete type 'struct in6_pktinfo'".  See
+  # http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-  patches = [ ./resolv-without-domain.patch ./no-mkdir-var-run.patch ];
+  buildInputs = [makeWrapper];
 
-  postInstall = ''
-    wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
-      "${nettools}/bin:${nettools}/sbin:${coreutils}/bin:${gnused}/bin"
-  '';
+  postInstall =
+    ''
+      cp client/scripts/linux $out/sbin/dhclient-script
+      substituteInPlace $out/sbin/dhclient-script \
+        --replace /sbin/ip ${iproute}/sbin/ip
+      wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
+        "${nettools}/bin:${nettools}/sbin:${iputils}/bin"
+    '';
 
   meta = {
     description = "Dynamic Host Configuration Protocol (DHCP) tools";