Skip to content

Commit

Permalink
Fix Windows cross compilation by downgrading haskell.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
HeinrichApfelmus committed Dec 17, 2024
1 parent 9e619ec commit 7fde8cb
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 44 deletions.
89 changes: 47 additions & 42 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@
flake = false;
};
haskellNix = {
url = "github:input-output-hk/haskell.nix";
# GHC 8.10.7 cross compilation for windows is broken in newer versions of haskell.nix.
# Unpin this once we no longer need GHC 8.10.7.
# We follow
# https://github.com/IntersectMBO/cardano-node/blob/36871ba0cd3e86a5dbcfd6878cdb7168bb4e56a1/flake.nix#L17C1-L23C7
url = "github:input-output-hk/haskell.nix/cb139fa956158397aa398186bb32dd26f7318784";
inputs.nixpkgs.follows = "nixpkgs";
inputs.hackage.follows = "hackage";
};
Expand Down
4 changes: 3 additions & 1 deletion nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ CHaP: haskell-nix: nixpkgs-recent: nodePkgs: haskell-nix.cabalProject' [

in {
name = "cardano-wallet";
compiler-nix-name = "ghc966";
# We're pinned to GHC 9.6.4
# due to haskell.nix issues with Windows cross-compilation.
compiler-nix-name = "ghc964";

src = haskellLib.cleanSourceWith {
name = "cardano-wallet-src";
Expand Down

0 comments on commit 7fde8cb

Please sign in to comment.