From 7c3fa29e3028e946220252912b5dab50787ce82f Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 19 Jan 2015 14:49:10 +0100
Subject: [PATCH] Fix LOCALE_ARCHIVE handling

---
 pkgs/development/compilers/pakcs/default.nix | 1 -
 pkgs/top-level/python-packages.nix           | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 433301e7ac0..739804646c2 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     # Some comments in files are in UTF-8, so include the locale needed by GHC runtime.
-    export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
     export LC_ALL=en_US.UTF-8
 
     # PAKCS must be build in place due to embedded filesystem references placed by swi.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf7d5d865fe..2129e0afe99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9291,7 +9291,7 @@ let
       md5 = "d9822ad0238e17b382a3c756ea94fe0d";
     };
 
-    buildInputs = with self; [ nose pillow pkgs.gfortran ];
+    buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ];
 
     buildPhase = ''
@@ -9300,7 +9300,7 @@ let
     '';
 
     checkPhase = ''
-      LOCALE_ARCHIVE=${pkgs.glibcLocales} LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests
+      LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests
     '';
 
     meta = {