From ffb635eb65a7342b15cdb3798a1a0690f9f51cad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Nov 2014 18:10:23 +0100 Subject: [PATCH] cabal: fix GHC 6.10.4 builds 3e8344d334d42824 added some magic -optP-P flag that the old compiler version doesn't support. --- pkgs/build-support/cabal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index b7c523f7181..83294373c1e 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -247,7 +247,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; export GHC_PACKAGE_PATH=$(${ghc.GHCPackages}) test -n "$noHaddock" || ./Setup haddock --html --hoogle \ - --ghc-options=-optP-P \ + ${optionalString (stdenv.lib.versionOlder "6.12" ghc.version) "--ghc-options=-optP-P"} \ ${optionalString self.hyperlinkSource "--hyperlink-source"} eval "$postBuild"