From 4687b6142c7c7440ece90e86b01bdb5e495d6e65 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Jan 2017 13:25:50 -0500 Subject: [PATCH] haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-compiling --- pkgs/development/haskell-modules/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 673099e0dc4..ef73e47f537 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;