Author: eelco
Date: Mon Mar 19 02:53:58 2012
New Revision: 33248
URL: https://nixos.org/websvn/nix/?rev=33248&sc=1
Log:
* 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.
Modified:
nixos/trunk/modules/config/i18n.nix
nixos/trunk/modules/programs/bash/profile.sh
Modified: nixos/trunk/modules/config/i18n.nix
==============================================================================
--- nixos/trunk/modules/config/i18n.nix Mon Mar 19 02:45:52 2012 (r33247)
+++ nixos/trunk/modules/config/i18n.nix Mon Mar 19 02:53:58 2012 (r33248)
@@ -68,6 +68,5 @@
environment.shellInit =
''
export LANG=${config.i18n.defaultLocale}
- export
LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
'';
}
Modified: nixos/trunk/modules/programs/bash/profile.sh
==============================================================================
--- nixos/trunk/modules/programs/bash/profile.sh Mon Mar 19 02:45:52
2012 (r33247)
+++ nixos/trunk/modules/programs/bash/profile.sh Mon Mar 19 02:53:58
2012 (r33248)
@@ -12,6 +12,7 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
