diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-16 21:48:27 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-10-16 21:48:27 +0000 |
| commit | 91e960b40011a04ea4d44c6e0344127961098264 (patch) | |
| tree | 5dc692d6e1cc0a3ac79adebb9ecca64ff258ef83 /pkgs/tools | |
| parent | 3d9df37b339cf2738eac63c9f7d7cde07738a1d5 (diff) | |
| download | nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar.gz nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar.bz2 nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar.lz nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar.xz nixlib-91e960b40011a04ea4d44c6e0344127961098264.tar.zst nixlib-91e960b40011a04ea4d44c6e0344127961098264.zip | |
remove dependency on /bin/bash for dhclient
svn path=/nixpkgs/trunk/; revision=4094
Diffstat (limited to 'pkgs/tools')
| -rwxr-xr-x | pkgs/tools/networking/dhcp/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/dhcp-3.0.3-bash.patch | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/tools/networking/dhcp/builder.sh b/pkgs/tools/networking/dhcp/builder.sh index 98f3cd6b2ec4..e2e61fd4e94c 100755 --- a/pkgs/tools/networking/dhcp/builder.sh +++ b/pkgs/tools/networking/dhcp/builder.sh @@ -10,6 +10,7 @@ configurePhase() { preBuild() { sed -e "s^@nettools\@^$nettools^g" \ -e "s^@coreutils\@^$coreutils^g" \ + -e "s^@bash\@^$bash^g" \ -e "s^@iputils\@^$iputils^g" \ -e "s^@gnused\@^$gnused^g" \ < client/scripts/linux > client/scripts/linux.tmp diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index aa8c6a222ed6..4ad93d6c15d0 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused}: +{stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused, bash}: stdenv.mkDerivation { name = "dhcp-3.0.3"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "f91416a0b8ed3fd0601688cf0b7df58f"; }; buildInputs = [groff]; - inherit nettools coreutils iputils gnused; - patches = [./dhcp-3.0.3-path.patch]; + inherit nettools coreutils iputils gnused bash; + patches = [./dhcp-3.0.3-path.patch ./dhcp-3.0.3-bash.patch]; } diff --git a/pkgs/tools/networking/dhcp/dhcp-3.0.3-bash.patch b/pkgs/tools/networking/dhcp/dhcp-3.0.3-bash.patch new file mode 100644 index 000000000000..7f2f9177397a --- /dev/null +++ b/pkgs/tools/networking/dhcp/dhcp-3.0.3-bash.patch @@ -0,0 +1,9 @@ +diff -ruN dhcp-3.0.3/client/scripts/linux dhcp-3.0.3.new/client/scripts/linux +--- dhcp-3.0.3/client/scripts/linux 2002-11-15 02:09:09.000000000 +0100 ++++ dhcp-3.0.3.new/client/scripts/linux 2005-10-16 22:42:09.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@bash@/bin/bash + # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. + # No guarantees about this. I'm a novice at the details of Linux |