summary refs log tree commit diff
path: root/pkgs/development/libraries/opencv
diff options
context:
space:
mode:
authorRoel van Dijk <roel@lambdacube.nl>2018-03-01 15:45:15 +0100
committerRoel van Dijk <roel@lambdacube.nl>2018-03-01 15:45:15 +0100
commitda134f8a8a99b699f6cab7707330e9388e1bc53b (patch)
treeca4ebd5dda60a1fbb6ae208f014bae86ff03342f /pkgs/development/libraries/opencv
parent8a10de3749cedc960dee9cdba088193f70f7e771 (diff)
downloadnixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar.gz
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar.bz2
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar.lz
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar.xz
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.tar.zst
nixpkgs-da134f8a8a99b699f6cab7707330e9388e1bc53b.zip
opencv: flag to enable tbb
enableTbb makes opencv use the "threading building blocks" library as
the parallel framework
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r--pkgs/development/libraries/opencv/3.x.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index ff3ac3b0363..3f36cca209f 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -25,6 +25,7 @@
 , enableFfmpeg    ? false, ffmpeg
 , enableGStreamer ? false, gst_all_1
 , enableTesseract ? false, tesseract, leptonica
+, enableTbb       ? false, tbb
 , enableOvis      ? false, ogre
 , enableGPhoto2   ? false, libgphoto2
 , enableDC1394    ? false, libdc1394
@@ -211,6 +212,7 @@ stdenv.mkDerivation rec {
     # simply enabled automatically if contrib is built, and it detects
     # tesseract & leptonica.
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
+    ++ lib.optional enableTbb tbb
     ++ lib.optional enableCuda cudatoolkit
     ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
     ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
@@ -240,6 +242,7 @@ stdenv.mkDerivation rec {
     (opencvFlag "OPENEXR" enableEXR)
     (opencvFlag "CUDA" enableCuda)
     (opencvFlag "CUBLAS" enableCuda)
+    (opencvFlag "TBB" enableTbb)
   ] ++ lib.optionals enableCuda [
     "-DCUDA_FAST_MATH=ON"
     "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"