Browse Source

* Move the optional parts of the system path to the appropriate

modules.

svn path=/nixos/branches/modular-nixos/; revision=15791
nsd-state-dir
Eelco Dolstra 14 years ago
parent
commit
548fb6a1a5
  1. 3
      modules/config/fonts.nix
  2. 6
      modules/config/nsswitch.nix
  3. 16
      modules/config/system-path.nix
  4. 2
      modules/installer/tools/tools.nix

3
modules/config/fonts.nix

@ -173,4 +173,7 @@ in
''
export FONTCONFIG_FILE=/etc/fonts/fonts.conf
'';
environment.systemPackages =
pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts;
}

6
modules/config/nsswitch.nix

@ -53,4 +53,10 @@ in
LD_LIBRARY_PATH=${config.system.nssModules.path}:$LD_LIBRARY_PATH
''
else "";
# 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.
environment.systemPackages = [config.system.nssModules.list];
}

16
modules/config/system-path.nix

@ -7,7 +7,7 @@ with pkgs.lib;
let
systemPackages =
requiredPackages =
[ config.system.sbin.modprobe # must take precedence over module_init_tools
config.system.sbin.mount # must take precedence over util-linux
config.environment.nix
@ -58,16 +58,7 @@ let
pkgs.utillinux
pkgs.wirelesstools
(import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
]
++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
++ config.environment.extraPackages
++ pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts
# 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.
++ config.system.nssModules.list;
] ++ config.environment.extraPackages;
options = {
@ -75,7 +66,6 @@ let
environment = {
systemPackages = mkOption {
default = systemPackages;
description = ''
The set of packages that appear in
/var/run/current-system/sw. These packages are
@ -135,4 +125,6 @@ in
{
require = [options];
environment.systemPackages = requiredPackages;
}

2
modules/installer/tools/tools.nix

@ -76,7 +76,7 @@ in
{
require = options;
environment.extraPackages =
environment.systemPackages =
[ nixosInstall
nixosRebuild
nixosHardwareScan

Loading…
Cancel
Save