From dde8453a09bc847f660d45a0eec303fbd10402da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Mar 2012 02:53:58 +0000 Subject: [PATCH] * 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 --- modules/config/i18n.nix | 1 - modules/programs/bash/profile.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix index 744eaee6667..c53325ed4e6 100644 --- a/modules/config/i18n.nix +++ b/modules/config/i18n.nix @@ -68,6 +68,5 @@ in environment.shellInit = '' export LANG=${config.i18n.defaultLocale} - export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive ''; } diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh index dbda74309a2..152b83107a1 100644 --- a/modules/programs/bash/profile.sh +++ b/modules/programs/bash/profile.sh @@ -12,6 +12,7 @@ __ETC_PROFILE_SOURCED=1 export __ETC_PROFILE_DONE=1 # 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 MODULE_DIR=@modulesTree@/lib/modules export NIXPKGS_CONFIG=/nix/etc/config.nix