From 81acfbfb9fa669531b35ed7a9c706136cd57ca70 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 31 Dec 2017 12:45:23 +0100 Subject: [PATCH] opencv: use system protobuf compiler --- pkgs/development/libraries/opencv/3.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 767ea8bb715f..ac8befc88110 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -214,6 +214,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_OPENMP=ON" + "-DBUILD_PROTOBUF=OFF" + "-DPROTOBUF_UPDATE_FILES=ON" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -231,6 +233,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Workaround for: https://github.com/opencv/opencv/issues/10474 + preBuild = '' + make opencv_dnn + ''; + postBuild = lib.optionalString enableDocs '' make doxygen '';