git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Check the right platform when setting LOCALE_ARCHIVE (#810)
5bdfe10Michael Peyton Jones
lib/call-cabal-project-to-nix.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -324,7 +324,7 @@ let
324 }) (pkgs.evalPackages.runCommand (if name == null then "plan-to-nix-pkgs" else name + "-plan-to-nix-pkgs") {
324 }) (pkgs.evalPackages.runCommand (if name == null then "plan-to-nix-pkgs" else name + "-plan-to-nix-pkgs") {
325 nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync ];
325 nativeBuildInputs = [ nix-tools dummy-ghc dummy-ghc-pkg cabal-install pkgs.evalPackages.rsync ];
326 # Needed or stack-to-nix will die on unicode inputs
326 # Needed or stack-to-nix will die on unicode inputs
327− LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.stdenv.hostPlatform.libc == "glibc") "${pkgs.glibcLocales}/lib/locale/locale-archive";
327+ LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";
328 LANG = "en_US.UTF-8";
328 LANG = "en_US.UTF-8";
329 meta.platforms = pkgs.lib.platforms.all;
329 meta.platforms = pkgs.lib.platforms.all;
330 preferLocalBuild = false;
330 preferLocalBuild = false;