Merge pull request #40416 from oxij/os/fix-some-types

nixos: fix some types
This commit is contained in:
xeji 2018-05-13 18:15:55 +02:00 committed by GitHub
commit 8c78d3a527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -12,6 +12,7 @@ in
options = { options = {
services.xserver.desktopManager.xterm.enable = mkOption { services.xserver.desktopManager.xterm.enable = mkOption {
type = types.bool;
default = true; default = true;
description = "Enable a xterm terminal as a desktop manager."; description = "Enable a xterm terminal as a desktop manager.";
}; };

View File

@ -217,7 +217,7 @@ in rec {
environment = mkOption { environment = mkOption {
default = {}; default = {};
type = with types; attrsOf (nullOr (either str package)); type = with types; attrsOf (nullOr (either str (either path package)));
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
description = "Environment variables passed to the service's processes."; description = "Environment variables passed to the service's processes.";
}; };