From e50802323c3ae38ef7ecce2d438c365bde6c6b0e Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Fri, 2 Jan 2015 14:19:17 -0500 Subject: [PATCH] Work around issues that appear when compiling the 'split' and 'dependent-map' packages with ghcjs --- pkgs/top-level/haskell-defaults.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9851a0fcdf3..2c97feca6c0 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -303,6 +303,24 @@ unix = null; unorderedContainers = null; vector = null; + + # GHCJS-specific workarounds + split = super.split.override { + cabal = self.cabal.override { + extension = self: super: { + doCheck = false; # Under ghcjs, the tests hang + }; + }; + }; + dependentMap = super.dependentMap.override { + cabal = self.cabal.override { + extension = self: super: { + preConfigure = '' + sed -i 's/^.*ghc-options:.*$//' *.cabal + ''; # Without this, we get "target ‘base’ is not a module name or a source file" + }; + }; + }; }; };