ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46542 from obsidiansystems/dhcpcd-cleanup

Browse Source 
dhcpcd: No need to hack around broken patchShebangs anymore
This commit is contained in:
John Ericson 2018-09-11 16:40:38 -04:00 committed by GitHub
commit cb8fb7e71b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ];
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;