diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-02 18:22:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 18:22:18 +0200 |
| commit | 4d1abc44199c8957105f538119c2d19d67aee26f (patch) | |
| tree | b38dcdc8763d2d5ab0068851a0765d09136a6af7 /pkgs/tools/networking/dhcpcd/default.nix | |
| parent | fbc1fb78e37cc29eadee4ad8687e8777eba3cf0e (diff) | |
| parent | fe970a82ece66e08d5400c22eebd2c2ec19b5457 (diff) | |
| download | nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar.gz nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar.bz2 nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar.lz nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar.xz nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.tar.zst nixlib-4d1abc44199c8957105f538119c2d19d67aee26f.zip | |
Merge pull request #47604 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/tools/networking/dhcpcd/default.nix')
| -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 a03d2a123932..fa025a2ec89e 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 = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = https://roy.marples.name/projects/dhcpcd; |