diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 673099e0dc49..ef73e47f537e 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -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; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 092d4ae45242..a7696dfc2e31 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -94,6 +94,7 @@ let "--with-gcc=${ghc.cc}" "--with-ld=${ghc.ld}" "--hsc2hs-options=--cross-compile" + "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" ]; crossCabalFlagsString =