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

Merge pull request #43666 from dtzWill/fix/haskell-glibc-locales-are-for-glibc

Browse Source 
haskell-modules: only include glibc locales when using glibc
This commit is contained in:
Peter Simons 2018-07-17 16:18:06 +02:00 committed by GitHub
commit 464cf105c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ++
optional stdenv.isLinux glibcLocales ++
optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
[ ghc pkgconfig stack ];
STACK_PLATFORM_VARIANT="nix";

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

@ -128,7 +128,7 @@ let
preferLocalBuild = true;
phases = ["installPhase"];
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 = ''
export HOME="$TMP"
mkdir -p "$out"