summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/default.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2017-01-11 13:25:50 -0500
committerShea Levy <shea@shealevy.com>2017-01-11 13:25:50 -0500
commit4687b6142c7c7440ece90e86b01bdb5e495d6e65 (patch)
treea5a91191e21c76ff0da4e49b52f5d8f262401a5d /pkgs/development/haskell-modules/default.nix
parent8ff396ae97cab9ca45bbf9776922c663ef308765 (diff)
downloadnixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar.gz
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar.bz2
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar.lz
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar.xz
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.tar.zst
nixpkgs-4687b6142c7c7440ece90e86b01bdb5e495d6e65.zip
haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-compiling
Diffstat (limited to 'pkgs/development/haskell-modules/default.nix')
-rw-r--r--pkgs/development/haskell-modules/default.nix5
1 files changed, 4 insertions, 1 deletions
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;