diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-12-31 12:45:23 +0100 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-01-09 00:46:34 +0000 |
| commit | 81acfbfb9fa669531b35ed7a9c706136cd57ca70 (patch) | |
| tree | 4bea4bf4538454b6d018b02033b9ff34d42ed5a1 /pkgs/development/libraries/opencv | |
| parent | 965e5c24d6c6b3fedee0814115e88bea8a56daaa (diff) | |
| download | nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar.gz nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar.bz2 nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar.lz nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar.xz nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.tar.zst nixpkgs-81acfbfb9fa669531b35ed7a9c706136cd57ca70.zip | |
opencv: use system protobuf compiler
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 767ea8bb715..ac8befc8811 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 ''; |