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

Merge pull request #6824 from cstrahan/hs-mesos

Browse Source 
hs-mesos: fix build
This commit is contained in:
Peter Simons 2015-03-16 12:10:24 +01:00
commit 3f41103aaf
2 changed files with 7 additions and 1 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

@ -200,6 +200,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;

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

@ -4461,7 +4461,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 { };