Browse Source

Merge pull request #22057 from shlevy/haskell-modules-cross-env

(haskellPackages.callPackage foo).env: Set the right env vars when cross-compiling
nixos-19.03
Peter Simons 6 years ago committed by GitHub
parent
commit
24fed4d344
  1. 6
      pkgs/development/haskell-modules/generic-builder.nix

6
pkgs/development/haskell-modules/generic-builder.nix

@ -148,8 +148,10 @@ let
setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
setupCommand = "./Setup";
ghcCommand = if isGhcjs then "ghcjs" else if isCross then "${ghc.cross.config}-ghc" else "ghc";
ghcCommandCaps = toUpper ghcCommand;
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
ghcCommand = "${crossPrefix}${ghcCommand'}";
ghcCommandCaps= lib.toUpper ghcCommand';
in

Loading…
Cancel
Save