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

Merge pull request #21811 from shlevy/ghc-cross-hsc2hs-jailbreak

Browse Source 
GHC cross compilation native jailbreak and hsc2hs
This commit is contained in:
Peter Simons 2017-01-11 21:33:00 +01:00 committed by GitHub
commit e755dc3fd7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/haskell-modules/default.nix
View File

@ -14,7 +14,10 @@ let
mkDerivation = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
inherit (self) ghc jailbreak-cabal;
jailbreak-cabal = if (self.ghc.cross or null) != null
then self.ghc.bootPkgs.jailbreak-cabal
else self.jailbreak-cabal;
inherit (self) ghc;
hscolour = overrideCabal self.hscolour (drv: {
isLibrary = false;
doHaddock = false;

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

@ -94,6 +94,7 @@ let
"--with-gcc=${ghc.cc}"
"--with-ld=${ghc.ld}"
"--hsc2hs-options=--cross-compile"
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
];
crossCabalFlagsString =