diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-03-04 22:59:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 22:59:36 +0000 |
| commit | 28b48fd8ef8a09583ba76923f0548c52eb2ebae3 (patch) | |
| tree | 5373e062e17ed8021f62168b0324d08e13564717 /pkgs/development/libraries/opencv | |
| parent | 7bffe53aeac12788bc9d7fa1a4145e181eb114d8 (diff) | |
| parent | da134f8a8a99b699f6cab7707330e9388e1bc53b (diff) | |
| download | nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar.gz nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar.bz2 nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar.lz nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar.xz nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.tar.zst nixpkgs-28b48fd8ef8a09583ba76923f0548c52eb2ebae3.zip | |
Merge pull request #36170 from LumiGuide/feat-opencv-tbb
opencv: flag to enable tbb
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 3 |
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 83a0c628cc1..49574a4b421 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 @@ -203,6 +204,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 ]; @@ -233,6 +235,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" |