nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

launchd: allow string entries for serviceOptions.path

Browse source 
Fixes evaluation of khd.
This commit is contained in:
Daiderd Jordan 2017-05-14 00:03:49 +02:00
parent e9cf765076
commit a4eb645d0d
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/launchd/default.nix
View file

@ -14,6 +14,8 @@ let
launchdConfig = import ./launchd.nix;
makeDrvBinPath = ps: concatMapStringsSep ":" (p: if isDerivation p then "${p}/bin" else p) ps;
serviceOptions =
{ config, name, ... }:
let
@ -33,15 +35,14 @@ let
};
path = mkOption {
type = types.listOf types.path;
type = types.loeOf (types.either types.path types.str);
default = [];
apply = ps: "${makeBinPath ps}";
description = ''
Packages added to the service's <envar>PATH</envar>
environment variable. Both the <filename>bin</filename>
and <filename>sbin</filename> subdirectories of each
package are added.
environment variable. Only the <filename>bin</filename>
and subdirectories of each package is added.
'';
apply = ps: if isList ps then (makeDrvBinPath ps) else ps;
};
command = mkOption {