* Initialise $LOCALE_ARCHIVE earlier in /etc/profile to prevent the

warning

    -bash: warning: setlocale: LC_TIME: cannot change locale (en_GB.UTF8): No such file or directory

  when $LC_TIME is set in environment.shellInit.

svn path=/nixos/trunk/; revision=33248
This commit is contained in:
Eelco Dolstra 2012-03-19 02:53:58 +00:00
parent bcbe2dce4c
commit dde8453a09
2 changed files with 1 additions and 1 deletions

View File

@ -68,6 +68,5 @@ in
environment.shellInit = environment.shellInit =
'' ''
export LANG=${config.i18n.defaultLocale} export LANG=${config.i18n.defaultLocale}
export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
''; '';
} }

View File

@ -12,6 +12,7 @@ __ETC_PROFILE_SOURCED=1
export __ETC_PROFILE_DONE=1 export __ETC_PROFILE_DONE=1
# Initialise a bunch of environment variables. # Initialise a bunch of environment variables.
export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed
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