mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Add nssModules' to
systemPathsList', add /lib' to
systemPath', and
add `/var/run/current-system/sw/lib' to `LD_LIBRARY_PATH'. This should allow NSS modules to be added and taken into account by applications without the need to reboot. svn path=/nixos/trunk/; revision=11290
This commit is contained in:
parent
6ce57e3117
commit
1a75f0a5a8
|
@ -1,5 +1,5 @@
|
||||||
export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
|
export PATH=@wrapperDir@:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin
|
||||||
export LD_LIBRARY_PATH=@nssModulesPath@
|
export LD_LIBRARY_PATH=@nssModulesPath@:/var/run/current-system/sw/lib
|
||||||
export MODULE_DIR=@modulesTree@/lib/modules
|
export MODULE_DIR=@modulesTree@/lib/modules
|
||||||
export NIXPKGS_CONFIG=/nix/etc/config.nix
|
export NIXPKGS_CONFIG=/nix/etc/config.nix
|
||||||
export PAGER="less -R"
|
export PAGER="less -R"
|
||||||
|
|
|
@ -2321,10 +2321,10 @@ root ALL=(ALL) SETENV: ALL
|
||||||
environment = {
|
environment = {
|
||||||
|
|
||||||
pathsToLink = mkOption {
|
pathsToLink = mkOption {
|
||||||
default = ["/bin" "/sbin" "/share" "/man" "/info"];
|
default = ["/bin" "/sbin" "/lib" "/share" "/man" "/info"];
|
||||||
example = ["/"];
|
example = ["/"];
|
||||||
description = "
|
description = "
|
||||||
This allows to symlink more directories in /var/run/current-system/sw
|
Lists directories to be symlinked in `/var/run/current-system/sw'.
|
||||||
";
|
";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -259,12 +259,16 @@ rec {
|
||||||
++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
|
++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
|
||||||
++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
|
++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
|
||||||
++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
|
++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
|
||||||
++ pkgs.lib.optional config.services.avahi.nssmdns pkgs.nssmdns
|
|
||||||
++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp
|
++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp
|
||||||
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
|
++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
|
||||||
++ config.environment.extraPackages pkgs
|
++ config.environment.extraPackages pkgs
|
||||||
++ pkgs.lib.optional config.fonts.enableFontDir fontDir;
|
++ pkgs.lib.optional config.fonts.enableFontDir fontDir
|
||||||
|
|
||||||
|
# NSS modules need to be in `systemPath' so that (i) the builder
|
||||||
|
# chroot gets to seem them, and (ii) applications can benefit from
|
||||||
|
# changes in the list of NSS modules at run-time, without requiring
|
||||||
|
# a reboot.
|
||||||
|
++ nssModules;
|
||||||
|
|
||||||
# We don't want to put all of `startPath' and `path' in $PATH, since
|
# We don't want to put all of `startPath' and `path' in $PATH, since
|
||||||
# then we get an embarrassingly long $PATH. So use the user
|
# then we get an embarrassingly long $PATH. So use the user
|
||||||
|
@ -273,7 +277,11 @@ rec {
|
||||||
systemPath = pkgs.buildEnv {
|
systemPath = pkgs.buildEnv {
|
||||||
name = "system-path";
|
name = "system-path";
|
||||||
paths = systemPathList;
|
paths = systemPathList;
|
||||||
|
|
||||||
|
# Note: We need `/lib' to be among `pathsToLink' for NSS modules
|
||||||
|
# to work.
|
||||||
inherit (config.environment) pathsToLink;
|
inherit (config.environment) pathsToLink;
|
||||||
|
|
||||||
ignoreCollisions = true;
|
ignoreCollisions = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue