about summary refs log tree commit diff
path: root/nixos/modules/system/boot
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-01-06 15:58:06 +0100
committerSilvan Mosberger <contact@infinisil.com>2020-01-06 15:58:06 +0100
commit9327e1c6ba1e65471b90ca27cf4cb14cd8469119 (patch)
treee8a0001687ab5e5dd92c4cd521c9be55b11f8fdf /nixos/modules/system/boot
parent2e8fc97dbfacc1178ae846ab31210539f7a958f0 (diff)
downloadnixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar.gz
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar.bz2
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar.lz
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar.xz
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.tar.zst
nixlib-9327e1c6ba1e65471b90ca27cf4cb14cd8469119.zip
nixos/systemd: Explicitly put default path packages after others
This fixes the dhcpcd issue in https://github.com/NixOS/nixpkgs/issues/76969,
which was exposed by https://github.com/NixOS/nixpkgs/pull/75031
introducing changes in the module ordering and therefore option ordering
too.

The dhcpcd issue would also be fixable by explicitly putting
dhcpcd's paths before others, however it makes more sense for systemd's
default paths to be after all others by default, since they should only
be a fallback, which is how binary finding will work if they come after.
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r--nixos/modules/system/boot/systemd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 7951dcc816a3..c438bb216e70 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -240,7 +240,7 @@ let
   serviceConfig = { name, config, ... }: {
     config = mkMerge
       [ { # Default path for systemd services.  Should be quite minimal.
-          path =
+          path = mkAfter
             [ pkgs.coreutils
               pkgs.findutils
               pkgs.gnugrep