From 7e94f7943300cd292d0ad1f45406807b208a0e10 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 15 Mar 2015 18:57:44 -0400 Subject: [PATCH] hs-mesos: fix build mesos was propagating the wrong protobuf version, and the cabal file referenced some impure paths. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cd77d8ef2df..41dc6ef911f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -199,6 +199,12 @@ self: super: { # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + # Upstream notified by e-mail. permutation = dontCheck super.permutation; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f813179e7df..99134afdad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4449,7 +4449,7 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; }; mesos-dns = callPackage ../servers/dns/mesos-dns { };