Skip to content

Commit 59a6cd4

Browse files
committed
fix: Windows cross builds
1 parent 16f82f0 commit 59a6cd4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cross-windows.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ let tool-version-map = import ./tool-map.nix;
44
cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
55
# add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
66
compiler-not-in = compiler-list: name: (if __elem compiler-nix-name compiler-list then __trace "No ${name}. Not yet compatible with ${compiler-nix-name}" false else true);
7-
7+
# Exclude zstd support for now, since it's currently broken on mingw32W64:
8+
# https://github.com/NixOS/nixpkgs/issues/333338
9+
curl = pkgs.curlMinimal;
810
inherit (pkgs.haskell-nix.iserv-proxy-exes.${compiler-nix-name}) iserv-proxy iserv-proxy-interpreter;
911

1012
dllPkgs = [
@@ -56,7 +58,7 @@ let tool-version-map = import ./tool-map.nix;
5658
# A cabal-install wrapper that sets the appropriate static flags
5759
wrapped-cabal = pkgs.pkgsBuildBuild.writeShellApplication {
5860
name = "cabal";
59-
runtimeInputs = [ cabal-install pkgs.curl ];
61+
runtimeInputs = [ cabal-install curl ];
6062
text = ''
6163
# We do not want to quote NIX_CABAL_FLAGS
6264
# it will leave an empty argument, if they are empty.

0 commit comments

Comments
 (0)