diff --git a/pkgs/tools/networking/dhcp/builder.sh b/pkgs/tools/networking/dhcp/builder.sh index 8fbd42b944c..62481547702 100644 --- a/pkgs/tools/networking/dhcp/builder.sh +++ b/pkgs/tools/networking/dhcp/builder.sh @@ -1,15 +1,17 @@ source $stdenv/setup -export DESTDIR=$out - # Hack to prevent dhclient from overriding the PATH specified with # '-e' on the command-line. -makeFlags="CLIENT_PATH='\"FAKE_PATH=/nothing\"'" +makeFlagsArray=(CLIENT_PATH='\"FAKE_PATH=/nothing\"' \ + USERBINDIR=$out/bin BINDIR=$out/sbin CLIENTBINDIR=$out/sbin \ + ADMMANDIR=$out/share/man/cat8 FFMANDIR=$out/share/man/cat5 \ + LIBMANDIR=$out/share/man/cat3 USRMANDIR=$out/share/man/cat1 \ + LIBDIR=$out/lib INCDIR=$out/include \ +) configurePhase=configurePhase configurePhase() { ./configure - prefix=$out } preBuild=preBuild diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 5aa60c5ee38..ff7a0c87791 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "dhcp-3.0.5"; - builder=./builder.sh; + builder = ./builder.sh; src = fetchurl { url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.5.tar.gz; sha256 = "1dpz6y08vrn3mw0lrlwq1sfiq6nsixpwwgb9hngddka1lfr5yi6x";