From 9adc826c9a952dec9a2099673980059a49ab6d85 Mon Sep 17 00:00:00 2001
From: Ben Ford <ben@perurbis.com>
Date: Tue, 3 Feb 2015 08:47:51 +0000
Subject: [PATCH] Update hzk to use correct zookeeper_mt

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 pkgs/development/haskell-modules/hackage-packages.nix     | 2 +-
 pkgs/top-level/all-packages.nix                           | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4f8b1f6aefe7..92448b60a962 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -53,7 +53,13 @@ self: super: {
 
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
-  
+
+  hzk = overrideCabal super.hzk (drv: {
+    preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
+    configureFlags =  "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
+    doCheck = false;
+  });
+       
   haskakafka = overrideCabal super.haskakafka (drv: {
     preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
     configureFlags =  "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 98e09f1aa3f8..7e0df39de716 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -67457,7 +67457,7 @@ self: {
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { zookeeper_mt = null;};
+     }) { };
 
   "hzulip" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6e037b2ea3e..605ab63ca21b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8241,6 +8241,8 @@ let
 
   zookeeper = callPackage ../servers/zookeeper { };
 
+  zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
+  
   xquartz = callPackage ../servers/x11/xquartz { };
   quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };