From 59a060523e820fa420a94a022755c37ca8b54192 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 12 Mar 2014 20:03:14 -0400 Subject: [PATCH] Don't override the baseUnit's PATH by default --- nixos/modules/system/boot/systemd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3f92489b866..7305fb17261 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -173,7 +173,7 @@ let serviceConfig = { name, config, ... }: { config = mkMerge - [ { # Default path for systemd services. Should be quite minimal. + [ (mkIf (config.baseUnit == null) { # Default path for systemd services. Should be quite minimal. path = [ pkgs.coreutils pkgs.findutils @@ -182,7 +182,7 @@ let systemd ]; environment.PATH = config.path; - } + }) (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' #! ${pkgs.stdenv.shell} -e