From 78377ae5cf156841415d4e116eb1bde6ab70e5ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Jun 2017 18:50:08 +0200 Subject: [PATCH] haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade-syslog --- pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 89827e8c9d9..34048c0b439 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -464,4 +464,13 @@ self: super: builtins.intersectAttrs super { # Haskell OpenCV bindings need contrib code enabled in the C++ library. opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; + # Without this override, the builds lacks pkg-config. + opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + + # Needs a newer version of brick than lts-8.x provides. + hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; }; + + # Needs a newer version of hsyslog than lts-8.x provides. + logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; }; + }