From 7f27566ef5727f81b29bfa458b9024e6cb3f7539 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Wed, 17 Nov 2010 00:18:39 +0000
Subject: [PATCH] Adding wrapper to get users packages

Haddock calls directly into ghclib by passing our carefully crafted ghc-wrapper.
This means that haddock needs to be wrapped itself, which this patch does.

svn path=/nixpkgs/trunk/; revision=24716
---
 .../tools/documentation/haddock/haddock-2.7.2.nix        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
index 70dcf61d78c..b59ea328279 100644
--- a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
+++ b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
@@ -1,12 +1,17 @@
-{cabal, ghcPaths, alex, happy}:
+{cabal, ghcPaths, alex, happy, makeWrapper}:
 
 cabal.mkDerivation (self : {
   pname = "haddock";
   version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   name = self.fname;
   sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82";
-  extraBuildInputs = [alex happy];
+  extraBuildInputs = [alex happy makeWrapper];
   propagatedBuildInputs = [ghcPaths];
+
+  postInstall = ''
+   wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
+  '';
+
   meta = {
     description = "a tool for automatically generating documentation from annotated Haskell source code";
   };