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

Added configuration.nix option to add entries into nix.conf .

Browse Source 
svn path=/nixos/trunk/; revision=8910
This commit is contained in:
Michael Raskin 2007-06-21 17:14:33 +00:00
parent 9ad649ea36
commit 0e92d41124
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system/activate-configuration.sh
View File

@ -96,6 +96,9 @@ if test -z "@readOnlyRoot@"; then
# WARNING: this file is generated. # WARNING: this file is generated.
build-users-group = nixbld build-users-group = nixbld
build-max-jobs = @maxJobs@ build-max-jobs = @maxJobs@
@extraNixOptions@
EOF EOF
chown root.nixbld /nix/store chown root.nixbld /nix/store

11
system/options.nix
View File

@ -847,6 +847,17 @@
"; ";
} }
{
name = ["nix" "extraOptions"];
default = "";
example = "
gc-keep-outputs = true
gc-keep-derivations = true
";
description = "
This option allows to append lines to nix.conf.
";
}
{ {
name = ["security" "setuidPrograms"]; name = ["security" "setuidPrograms"];

1
system/system.nix
View File

@ -249,6 +249,7 @@ rec {
config.get ["security" "setuidPrograms"] ++ config.get ["security" "setuidPrograms"] ++
config.get ["security" "extraSetuidPrograms"]; config.get ["security" "extraSetuidPrograms"];
maxJobs = config.get ["nix" "maxJobs"]; maxJobs = config.get ["nix" "maxJobs"];
extraNixOptions = config.get ["nix" "extraOptions"];
inherit (usersGroups) createUsersGroups usersList groupsList; inherit (usersGroups) createUsersGroups usersList groupsList;