diff options
| author | Peter Simons <simons@cryp.to> | 2015-03-16 12:10:24 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-03-16 12:10:24 +0100 |
| commit | 3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b (patch) | |
| tree | ddb7b74cf889904278c61f6f382c36def38ca98a /pkgs/development/haskell-modules | |
| parent | c8016e5b31bbbda48c43ba558a1f55099a97352c (diff) | |
| parent | 7e94f7943300cd292d0ad1f45406807b208a0e10 (diff) | |
| download | nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar.gz nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar.bz2 nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar.lz nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar.xz nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.tar.zst nixlib-3f41103aaf61f202cfea7867fcce0ab7c1cc4b8b.zip | |
Merge pull request #6824 from cstrahan/hs-mesos
hs-mesos: fix build
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b1f5075bcb13..466af76185fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; |