diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-03-15 18:57:44 -0400 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-03-15 18:57:44 -0400 |
commit | 7e94f7943300cd292d0ad1f45406807b208a0e10 (patch) | |
tree | e1e995083dc3754f7fdd8fe158c6712eba13298f /pkgs/development/haskell-modules | |
parent | 4b2b30ea249b110b4c895256216dc8af155ffcb6 (diff) | |
download | nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar.gz nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar.bz2 nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar.lz nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar.xz nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.tar.zst nixlib-7e94f7943300cd292d0ad1f45406807b208a0e10.zip |
hs-mesos: fix build
mesos was propagating the wrong protobuf version, and the cabal file referenced some impure paths.
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 cd77d8ef2df7..41dc6ef911f1 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; |