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

haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-compiling

Browse Source
This commit is contained in:
Shea Levy 2017-01-11 13:25:50 -05:00
parent 8ff396ae97
commit 4687b6142c
1 changed files with 4 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 { mkDerivation = pkgs.callPackage ./generic-builder.nix {
inherit stdenv; inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; 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: { hscolour = overrideCabal self.hscolour (drv: {
isLibrary = false; isLibrary = false;
doHaddock = false; doHaddock = false;