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

Allow additions to pathsToLink

Browse Source 
svn path=/nixos/trunk/; revision=21101
This commit is contained in:
Yury G. Kudryashov 2010-04-15 15:46:55 +00:00
parent 4d39d70406
commit dcd0be3351
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/config/system-path.nix
View File

@ -77,13 +77,23 @@ let
}; };
pathsToLink = mkOption { pathsToLink = mkOption {
# Note: We need `/lib' to be among `pathsToLink' for NSS modules
# to work.
default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"]; default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
example = ["/"]; example = ["/"];
description = " description = "
Lists directories to be symlinked in `/var/run/current-system/sw'. Lists directories to be symlinked in `/var/run/current-system/sw'.
Use extraLinkPaths if you want just to add some additional paths.
"; ";
}; };
extraLinkPaths = mkOption {
default = [];
example = ["/"];
description = "
Extra directories to be symlinked in /var/run/current-system/sw.
";
};
}; };
system = { system = {
@ -97,9 +107,7 @@ let
name = "system-path"; name = "system-path";
paths = list; paths = list;
# Note: We need `/lib' to be among `pathsToLink' for NSS modules pathsToLink = with config.environment; pathsToLink ++ extraLinkPaths;
# to work.
inherit (config.environment) pathsToLink;
ignoreCollisions = true; ignoreCollisions = true;
}; };