diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-11 16:40:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 16:40:38 -0400 |
| commit | cb8fb7e71ba7b99321156027934cc96fdf0f0ad7 (patch) | |
| tree | be9e1bcc9f566fc07137fc77ea2da215f388e249 /pkgs/tools | |
| parent | e258c8d8ddd954a1c65e233ebb1e7b36bc312eb3 (diff) | |
| parent | c64d76d0e682aa6094c3171e79475ad5be746b15 (diff) | |
| download | nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar.gz nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar.bz2 nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar.lz nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar.xz nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.tar.zst nixlib-cb8fb7e71ba7b99321156027934cc96fdf0f0ad7.zip | |
Merge pull request #46542 from obsidiansystems/dhcpcd-cleanup
dhcpcd: No need to hack around broken patchShebangs anymore
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 1fe29b8b96ff..bb568bd2c1e7 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ udev ]; + buildInputs = [ + udev + runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts + ]; preConfigure = "patchShebangs ./configure"; @@ -29,11 +32,6 @@ stdenv.mkDerivation rec { # Check that the udev plugin got built. postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; - # TODO shlevy remove once patchShebangs is fixed - postFixup = '' - find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|' - ''; - meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = https://roy.marples.name/projects/dhcpcd; |