diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-05 13:57:25 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-11 16:15:10 -0400 |
| commit | c64d76d0e682aa6094c3171e79475ad5be746b15 (patch) | |
| tree | 94d009a15100316e1d138793c2e8df66d6be56a3 /pkgs/tools/networking/dhcpcd | |
| parent | 9f9723b179961e7235d8e808c4ee8eaf52e05086 (diff) | |
| download | nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar.gz nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar.bz2 nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar.lz nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar.xz nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.tar.zst nixpkgs-c64d76d0e682aa6094c3171e79475ad5be746b15.zip | |
dhcpcd: No need to hack around broken patchShebangs anymore
Diffstat (limited to 'pkgs/tools/networking/dhcpcd')
| -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 1fe29b8b96f..bb568bd2c1e 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; |