dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
dhcpcd: Use runtimeShell in dhcpcd-run-hooks
This commit is contained in:
Matthew Bauer 2018-12-03 09:48:38 -06:00 committed by GitHub
commit 357732e6a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }: { stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts: # 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 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"; preConfigure = "patchShebangs ./configure";
configureFlags = [ configureFlags = [