public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpcd: No need to hack around broken patchShebangs anymore

This commit is contained in:
John Ericson 2018-09-05 13:57:25 -04:00
parent 9f9723b179
commit c64d76d0e6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/dhcpcd/default.nix
View File

@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ udev ]; buildInputs = [
udev
runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
];
preConfigure = "patchShebangs ./configure"; preConfigure = "patchShebangs ./configure";
@ -29,11 +32,6 @@ stdenv.mkDerivation rec {
# Check that the udev plugin got built. # Check that the udev plugin got built.
postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]"; 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 = { meta = {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
homepage = https://roy.marples.name/projects/dhcpcd; homepage = https://roy.marples.name/projects/dhcpcd;