commit 464cf105c630109e19db8d183e229a749c0558db · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

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

haskell-modules: only include glibc locales when using glibc

authored by Peter Simons and committed by GitHub 7 years ago 464cf105 ed31b92d

+2 -2

2 changed files

expand all

unified split

pkgs

development

haskell-modules

generic-stack-builder.nix

make-package-set.nix

+1 -1

pkgs/development/haskell-modules/generic-stack-builder.nix

··· 27 28 buildInputs = 29 buildInputs ++ 30 - optional stdenv.isLinux glibcLocales ++ 31 [ ghc pkgconfig stack ]; 32 33 STACK_PLATFORM_VARIANT="nix";

··· 27 28 buildInputs = 29 buildInputs ++ 30 + optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++ 31 [ ghc pkgconfig stack ]; 32 33 STACK_PLATFORM_VARIANT="nix";

+1 -1

pkgs/development/haskell-modules/make-package-set.nix

··· 128 preferLocalBuild = true; 129 phases = ["installPhase"]; 130 LANG = "en_US.UTF-8"; 131 - LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; 132 installPhase = '' 133 export HOME="$TMP" 134 mkdir -p "$out"

··· 128 preferLocalBuild = true; 129 phases = ["installPhase"]; 130 LANG = "en_US.UTF-8"; 131 + LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; 132 installPhase = '' 133 export HOME="$TMP" 134 mkdir -p "$out"