JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-modules: only include glibc locales when using glibc

Browse Source 
Fixes #43665.
Hopefully. :)
This commit is contained in:
Will Dietz 2018-07-17 08:42:55 -05:00
parent 8155016932
commit da5383006d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/generic-stack-builder.nix
View File

@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // {
buildInputs = buildInputs =
buildInputs ++ buildInputs ++
optional stdenv.isLinux glibcLocales ++ optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
[ ghc pkgconfig stack ]; [ ghc pkgconfig stack ];
STACK_PLATFORM_VARIANT="nix"; STACK_PLATFORM_VARIANT="nix";

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -128,7 +128,7 @@ let
preferLocalBuild = true; preferLocalBuild = true;
phases = ["installPhase"]; phases = ["installPhase"];
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
installPhase = '' installPhase = ''
export HOME="$TMP" export HOME="$TMP"
mkdir -p "$out" mkdir -p "$out"