nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

hs-mesos: fix build

Browse Source 
mesos was propagating the wrong protobuf version, and the cabal file
referenced some impure paths.
This commit is contained in:
Charles Strahan 2015-03-15 18:57:44 -04:00
parent 4b2b30ea24
commit 7e94f79433
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

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

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

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