From da5383006d61f8f02f67daba529c533354ef75c5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 17 Jul 2018 08:42:55 -0500 Subject: [PATCH] haskell-modules: only include glibc locales when using glibc Fixes #43665. Hopefully. :) --- pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 9ea9dae02db..591de1236d4 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -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"; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 87ac65307aa..95dac230cc5 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -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"