From 558495ec6c55019ef571f3f43994f9ab97d1caf4 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 11 Aug 2020 11:31:43 +0100 Subject: [PATCH] Check the right platform when setting LOCALE_ARCHIVE This runs on during evaluation, so needs the evaluation platform's libc. --- lib/call-cabal-project-to-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/call-cabal-project-to-nix.nix b/lib/call-cabal-project-to-nix.nix index 2f42e9b873..7d99a03e8e 100644 --- a/lib/call-cabal-project-to-nix.nix +++ b/lib/call-cabal-project-to-nix.nix @@ -324,7 +324,7 @@ let }) (pkgs.evalPackages.runCommand (if name == null then "plan-to-nix-pkgs" else name + "-plan-to-nix-pkgs") { nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync ]; # Needed or stack-to-nix will die on unicode inputs - LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.stdenv.hostPlatform.libc == "glibc") "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive"; LANG = "en_US.UTF-8"; meta.platforms = pkgs.lib.platforms.all; preferLocalBuild = false;