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

Don't override the baseUnit's PATH by default

Browse Source
This commit is contained in:
Shea Levy 2014-03-12 20:03:14 -04:00
parent 3ed3c60d0f
commit 59a060523e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/systemd.nix
View File

@ -173,7 +173,7 @@ let
serviceConfig = { name, config, ... }: { serviceConfig = { name, config, ... }: {
config = mkMerge 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 = path =
[ pkgs.coreutils [ pkgs.coreutils
pkgs.findutils pkgs.findutils
@ -182,7 +182,7 @@ let
systemd systemd
]; ];
environment.PATH = config.path; environment.PATH = config.path;
} })
(mkIf (config.preStart != "") (mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
#! ${pkgs.stdenv.shell} -e #! ${pkgs.stdenv.shell} -e