Skip to content

Commit

Permalink
Use ucrt64 for GHC 9 windows cross compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed May 9, 2024
1 parent 4344aac commit 9d85432
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ haskell-nix.cabalProject' (
};
crossPlatforms = p: with p;
lib.optional (!builtins.elem config.compiler-nix-name ["ghc928"]) ghcjs ++
lib.optionals (system == "x86_64-linux") [
mingwW64
musl64
];
lib.optional (system == "x86_64-linux") musl64 ++
lib.optional (system == "x86_64-linux" && config.compiler-nix-name == "ghc8107") mingwW64 ++
lib.optional (system == "x86_64-linux" && config.compiler-nix-name != "ghc8107") ucrt66;
};
shell = {
crossPlatforms = p: lib.optional (compareGhc "9.0" < 0) p.ghcjs;
Expand Down

0 comments on commit 9d85432

Please sign in to comment.