JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update hzk to use correct zookeeper_mt

Browse Source
This commit is contained in:
Ben Ford 2015-02-03 08:47:51 +00:00 committed by Peter Simons
parent 40af5a2b59
commit 9adc826c9a
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -54,6 +54,12 @@ 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";

2
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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; };