Fix LOCALE_ARCHIVE handling

This commit is contained in:
Wout Mertens 2015-01-19 14:49:10 +01:00
parent 3d65a59e9f
commit 7c3fa29e30
2 changed files with 2 additions and 3 deletions

View File

@ -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.

View File

@ -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 = {