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

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

View File

@ -777,6 +777,11 @@ CREATE ROLE postgres LOGIN SUPERUSER;
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>. <link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>config.systemd.services.${name}.path</literal> now returns a list of paths instead of a colon-separated string.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

View File

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

View File

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