summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2009-07-30 10:04:48 +0000
committerMichael Raskin <7c6f434c@mail.ru>2009-07-30 10:04:48 +0000
commitb0e71363d1d8bbc7e95c88020d543062b55e1ec8 (patch)
treede9a7908d875c9fb74a76f5ba499e12083efa023 /pkgs/tools
parent0b46ac126b7eb93a9ce40d6d5266907e9dd88915 (diff)
downloadnixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar.gz
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar.bz2
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar.lz
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar.xz
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.tar.zst
nixpkgs-b0e71363d1d8bbc7e95c88020d543062b55e1ec8.zip
Make dhclient work again
svn path=/nixpkgs/trunk/; revision=16517
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/dhcp/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 94e59ad8b16..15d06e9d42d 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -21,9 +21,14 @@ stdenv.mkDerivation rec {
       substituteInPlace $out/sbin/dhclient-script \
         --replace /sbin/ip ${iproute}/sbin/ip
       wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
-        "${nettools}/bin:${nettools}/sbin:${iputils}/bin"
+        "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${stdenv.coreutils}/bin:${stdenv.gnused}/bin"
     '';
 
+  preConfigure = ''
+      sed -i "includes/dhcpd.h" \
+	-"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g"
+  '';
+
   meta = {
     description = "Dynamic Host Configuration Protocol (DHCP) tools";