forked from mirrors/nixpkgs
Allow additions to pathsToLink
svn path=/nixos/trunk/; revision=21101
This commit is contained in:
parent
4d39d70406
commit
dcd0be3351
|
@ -77,13 +77,23 @@ let
|
|||
};
|
||||
|
||||
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"];
|
||||
example = ["/"];
|
||||
description = "
|
||||
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 = {
|
||||
|
@ -97,9 +107,7 @@ let
|
|||
name = "system-path";
|
||||
paths = list;
|
||||
|
||||
# Note: We need `/lib' to be among `pathsToLink' for NSS modules
|
||||
# to work.
|
||||
inherit (config.environment) pathsToLink;
|
||||
pathsToLink = with config.environment; pathsToLink ++ extraLinkPaths;
|
||||
|
||||
ignoreCollisions = true;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue