movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-08 19:45:42 +03:00
Code Activity

nixos/systemd: Don't use apply for $PATH

Browse source 
When not using apply, other modules can use $PATH as a list instead of
getting a colon-separated list to each /bin directory.
This commit is contained in:
Janne Heß 2020-06-19 11:45:27 +02:00
parent 94c2122d38
commit 8cf4ec8b97
No known key found for this signature in database
GPG key ID: 69165158F05265DF
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/system/boot/systemd-unit-options.nix
View file

@ -234,7 +234,6 @@ in rec {
path = mkOption {
default = [];
type = with types; listOf (oneOf [ package str ]);
apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}";
description = ''
Packages added to the service's <envar>PATH</envar>
environment variable. Both the <filename>bin</filename>

2
nixos/modules/system/boot/systemd.nix
View file

@ -257,7 +257,7 @@ let
pkgs.gnused
systemd
];
environment.PATH = config.path;
environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";
}
(mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre =