Merge pull request #50936 from tathougies/travis/dhcpcd-runtime-shell

dhcpcd: Use runtimeShell in dhcpcd-run-hooks
2018-12-03 09:48:38 -06:00
parent ee1f6e20b2 c116de9411
commit 357732e6a3
1 changed files with 5 additions and 1 deletions
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:
+{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:

 stdenv.mkDerivation rec {
  # when updating this to >=7, check, see previous reverts:
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
    runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
  ];

+  prePatch = ''
+    substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
+  '';
+
  preConfigure = "patchShebangs ./configure";

  configureFlags = [