public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
(haskellPackages.callPackage foo).env: Set the right env vars when cross-compiling
This commit is contained in:
Peter Simons 2017-01-23 14:30:58 +01:00 committed by GitHub
commit 24fed4d344
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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