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

Add some option types

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-30 14:18:41 +01:00
parent c7f7ceefd6
commit 4680af6a93
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/system-path.nix
View File

@ -60,6 +60,7 @@ in
environment = { environment = {
systemPackages = mkOption { systemPackages = mkOption {
type = types.listOf types.path;
default = []; default = [];
example = "[ pkgs.icecat3 pkgs.thunderbird ]"; example = "[ pkgs.icecat3 pkgs.thunderbird ]";
description = '' description = ''
@ -74,6 +75,7 @@ in
}; };
pathsToLink = mkOption { pathsToLink = mkOption {
type = types.listOf types.str;
# Note: We need `/lib' to be among `pathsToLink' for NSS modules # Note: We need `/lib' to be among `pathsToLink' for NSS modules
# to work. # to work.
default = []; default = [];

2
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -247,7 +247,7 @@ in
# set at once. # set at once.
system.boot.loader.id = "grub"; system.boot.loader.id = "grub";
environment.systemPackages = [ grub ]; environment.systemPackages = optional (grub != null) grub;
boot.loader.grub.extraPrepareConfig = boot.loader.grub.extraPrepareConfig =
concatStrings (mapAttrsToList (n: v: '' concatStrings (mapAttrsToList (n: v: ''