Skip to content

Commit

Permalink
fix: Windows cross builds
Browse files Browse the repository at this point in the history
  • Loading branch information
sgillespie committed Oct 9, 2024
1 parent 16f82f0 commit 59a6cd4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cross-windows.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ let tool-version-map = import ./tool-map.nix;
cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
# add a trace helper. This will trace a message about disabling a component despite requesting it, if it's not supported in that compiler.
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);

# Exclude zstd support for now, since it's currently broken on mingw32W64:
# https://github.com/NixOS/nixpkgs/issues/333338
curl = pkgs.curlMinimal;
inherit (pkgs.haskell-nix.iserv-proxy-exes.${compiler-nix-name}) iserv-proxy iserv-proxy-interpreter;

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

0 comments on commit 59a6cd4

Please sign in to comment.