nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226532 from SuperSandro2000/dhcpcd

Browse Source 
dhcpcd: change files after patching; nixos/dhcpcd: link dhcpcd.conf to /etc/ to fix dhcpcd -k
This commit is contained in:
Peder Bergebakken Sundt 2024-01-31 16:43:54 +01:00 committed by GitHub
commit 9118823ed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/dhcpcd.nix
View File

@ -219,6 +219,8 @@ in
'';
} ];
environment.etc."dhcpcd.conf".source = dhcpcdConf;
systemd.services.dhcpcd = let
cfgN = config.networking;
hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")

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

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
];
prePatch = ''
postPatch = ''
substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
'';