Skip to content

Commit

Permalink
Fix windows 910-windows
Browse files Browse the repository at this point in the history
Build cabal 3.10.3.0 with GHC-9.8 if necessary
  • Loading branch information
sgillespie committed Oct 15, 2024
1 parent 40e6c1d commit 592578b
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions cross-windows.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ let tool-version-map = import ./tool-map.nix;
zstdSupport = false;
pslSupport = false;
});
# Haskell.nix pulls in cabal-install 3.10.3.0 which will not build with 9.10+. In that
# case, build with 9.8
native-cabal-install =
if builtins.compareVersions compiler.version "9.10" >= 0 then
pkgs.pkgsBuildBuild.haskell-nix.cabal-install.ghc982
else
pkgs.pkgsBuildBuild.haskell-nix.cabal-install.${compiler-nix-name};
inherit (pkgs.haskell-nix.iserv-proxy-exes.${compiler-nix-name}) iserv-proxy iserv-proxy-interpreter;

dllPkgs = [
Expand Down Expand Up @@ -165,10 +172,17 @@ pkgs.pkgsBuildBuild.mkShell ({
'' + (quirks.hint flavor) + quirks.shellHook;
buildInputs = [];

nativeBuildInputs = [ wrapped-ghc wrapped-hsc2hs wrapped-cabal wine-test-wrapper compiler ] ++ (with pkgs; [
nativeBuildInputs = [
wrapped-ghc
wrapped-hsc2hs
wrapped-cabal
wine-test-wrapper
compiler
native-cabal-install
]
++ (with pkgs; [
buildPackages.bintools.bintools
stdenv.cc
pkgsBuildBuild.haskell-nix.cabal-install.${compiler-nix-name}
(pkgsBuildBuild.pkg-config or pkgsBuildBuild.pkgconfig)
(tool "happy")
(tool "alex")
Expand Down

0 comments on commit 592578b

Please sign in to comment.