From c64d76d0e682aa6094c3171e79475ad5be746b15 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 5 Sep 2018 13:57:25 -0400 Subject: dhcpcd: No need to hack around broken patchShebangs anymore --- pkgs/tools/networking/dhcpcd/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/tools') 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; -- cgit 1.4.1