* Synced with trunk @ 15340

svn path=/nixos/branches/modular-nixos/; revision=15367

etc/bashrc.sh

@@ -16,6 +16,7 @@ export EDITOR=nano
 export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info
 export LOCATE_PATH=/var/cache/locatedb
 @shellInit@
+export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 
 # Set up secure multi-user builds: non-root users build through the
 # Nix daemon.

system/system-options.nix

@@ -104,6 +104,7 @@ in
         let path = [
           pkgs.coreutils pkgs.gnugrep pkgs.findutils
           pkgs.glibc # needed for getent
+          pkgs.glibcLocals # needed for getent
           pkgs.pwdutils
         ]; in noDepEntry ''
         export PATH=/empty