From 7da8137f187800084d8c87c7cd5c159fb371d134 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Apr 2009 21:52:10 +0000
Subject: [PATCH] * Re-enable Glibc locales.

svn path=/nixos/trunk/; revision=15340
---
 etc/bashrc.sh     | 1 +
 system/system.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/bashrc.sh b/etc/bashrc.sh
index 1a2b45794d9..ba8a0ebb9c6 100644
--- a/etc/bashrc.sh
+++ b/etc/bashrc.sh
@@ -18,6 +18,7 @@ export LOCATE_PATH=/var/cache/locatedb
 export KDEDIRS=@kdeDirs@
 export XDG_CONFIG_DIRS=@xdgConfigDirs@
 export XDG_DATA_DIRS=@xdgDataDirs@
+export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
 
 
 # Set up secure multi-user builds: non-root users build through the
diff --git a/system/system.nix b/system/system.nix
index c00704df020..ed7967c5f63 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -192,6 +192,7 @@ rec {
     pkgs.e2fsprogs
     pkgs.findutils
     pkgs.glibc # for ldd, getent
+    pkgs.glibcLocales
     pkgs.gnugrep
     pkgs.gnused
     pkgs.gnutar