From b0e71363d1d8bbc7e95c88020d543062b55e1ec8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 30 Jul 2009 10:04:48 +0000 Subject: [PATCH] Make dhclient work again svn path=/nixpkgs/trunk/; revision=16517 --- pkgs/tools/networking/dhcp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 94e59ad8b161..15d06e9d42d3 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";