From 23fb83b37ddc6a3cdfe3af50ad358cf040fea266 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 27 May 2014 12:53:26 -0500 Subject: [PATCH] Correctly locate Haddocks in hoogle-local expression On some versions of GHC, documentation is at, for example: LIB/share/doc/ In others, it is at: LIB/share/doc/x86_64-darwin-ghc7.6.3/ This change will pick up documentation first from the second location, then from the first. --- pkgs/development/libraries/haskell/hoogle/local.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 20816d3b2f9..337cd4c8154 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -73,7 +73,8 @@ cabal.mkDerivation (self: rec { for i in $docPackages; do import_dbs $i/share/doc - ln -sf $i/share/doc/* $out/share/hoogle/doc + ln -sf $i/share/doc/*-ghc-*/* $out/share/hoogle/doc 2> /dev/null \ + || ln -sf $i/share/doc/* $out/share/hoogle/doc done import_dbs ${self.ghc}/share/doc/ghc*/html/libraries