9c0b472 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Fix: set locale.

9c0b472Moritz Angermann8 years ago

builder/comp-builder.nix+4−1

@@ -1,4 +1,4 @@

1−{ stdenv, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs }:

1+{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs }:

3{ componentId

4, component

@@ -144,6 +144,8 @@ in stdenv.mkDerivation ({

144 };

145

146 CABAL_CONFIG = configFiles + /cabal.config;

147+ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase.

148+ LC_ALL = "en_US.UTF-8";

147

149

148 enableParallelBuilding = true;

150 enableParallelBuilding = true;

149

151

@@ -217,4 +219,5 @@ in stdenv.mkDerivation ({

217// lib.optionalAttrs (postCheck != "") { inherit postCheck; }

219// lib.optionalAttrs (postCheck != "") { inherit postCheck; }

218// lib.optionalAttrs (preInstall != "") { inherit preInstall; }

220// lib.optionalAttrs (preInstall != "") { inherit preInstall; }

219// lib.optionalAttrs (postInstall != "") { inherit postInstall; }

221// lib.optionalAttrs (postInstall != "") { inherit postInstall; }

222+// lib.optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive"; }

220)

223)