diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-12 20:32:57 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-12 20:32:57 +0000 |
| commit | bcb78a4ab7069a3e3dfce94babad84a835cf3704 (patch) | |
| tree | 4a8bcf0b23abc5e6e01fa78e64f785581da73789 /pkgs/tools/networking/dhcp | |
| parent | 14b6982164068d249d7ca98fe5195248f07fdc93 (diff) | |
make dhclient work
svn path=/nixpkgs/trunk/; revision=4077
Diffstat (limited to 'pkgs/tools/networking/dhcp')
| -rwxr-xr-x | pkgs/tools/networking/dhcp/builder.sh | 11 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/dhclient-execve.patch | 13 |
3 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/tools/networking/dhcp/builder.sh b/pkgs/tools/networking/dhcp/builder.sh index d58dbde7880..98f3cd6b2ec 100755 --- a/pkgs/tools/networking/dhcp/builder.sh +++ b/pkgs/tools/networking/dhcp/builder.sh @@ -7,6 +7,17 @@ configurePhase() { prefix=$out } +preBuild() { + sed -e "s^@nettools\@^$nettools^g" \ + -e "s^@coreutils\@^$coreutils^g" \ + -e "s^@iputils\@^$iputils^g" \ + -e "s^@gnused\@^$gnused^g" \ + < client/scripts/linux > client/scripts/linux.tmp + mv client/scripts/linux.tmp client/scripts/linux +} + +preBuild=preBuild + configurePhase=configurePhase genericBuild diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index eea9e7dbae1..aa8c6a222ed 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, groff}: +{stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused}: stdenv.mkDerivation { name = "dhcp-3.0.3"; @@ -8,5 +8,6 @@ stdenv.mkDerivation { md5 = "f91416a0b8ed3fd0601688cf0b7df58f"; }; buildInputs = [groff]; - patches = [./dhclient-execve.patch]; + inherit nettools coreutils iputils gnused; + patches = [./dhcp-3.0.3-path.patch]; } diff --git a/pkgs/tools/networking/dhcp/dhclient-execve.patch b/pkgs/tools/networking/dhcp/dhclient-execve.patch deleted file mode 100644 index 04690e122b4..00000000000 --- a/pkgs/tools/networking/dhcp/dhclient-execve.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3.new/client/dhclient.c ---- dhcp-3.0.3/client/dhclient.c 2005-03-03 17:55:22.000000000 +0100 -+++ dhcp-3.0.3.new/client/dhclient.c 2005-08-21 22:23:49.000000000 +0200 -@@ -2607,7 +2607,8 @@ - wstatus = 0; - } - } else { -- execve (scriptName, argv, envp); -+ /* execve (scriptName, argv, envp); */ -+ execv (scriptName, argv); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); - } |