summary refs log tree commit diff
path: root/pkgs/development/libraries/opencv
diff options
context:
space:
mode:
authorMathieu Rene <mathieu.rene@gmail.com>2023-03-12 16:15:14 -0400
committerMathieu Rene <mathieu.rene@gmail.com>2023-03-12 16:15:14 -0400
commite4c31c2dfc82bc6d87c0537715afd63ddff0c4f1 (patch)
treecc9edfa38866cd49523b7c2ac6a89e2bdf040f37 /pkgs/development/libraries/opencv
parent8df017265efe4ca8f51fc3765a23324510d16ab3 (diff)
downloadnixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar.gz
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar.bz2
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar.lz
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar.xz
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.tar.zst
nixpkgs-e4c31c2dfc82bc6d87c0537715afd63ddff0c4f1.zip
opencv3: Build with video input under darwin platforms
Adds the right dependencies for encoding video, and removes the cmake
flag preventing the feature to be compiled in.
Diffstat (limited to 'pkgs/development/libraries/opencv')
-rw-r--r--pkgs/development/libraries/opencv/3.x.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 75d8c712df1..45d55542c82 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -32,7 +32,7 @@
 , enableDC1394    ? false, libdc1394
 , enableDocs      ? false, doxygen, graphviz-nox
 
-, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
+, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2, CoreMedia, MediaToolbox
 }:
 
 assert blas.implementation == "openblas" && lapack.implementation == "openblas";
@@ -211,7 +211,7 @@ stdenv.mkDerivation {
     # tesseract & leptonica.
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optional enableTbb tbb
-    ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
+    ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]
     ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
 
   propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
@@ -250,7 +250,6 @@ stdenv.mkDerivation {
   ] ++ lib.optionals stdenv.isDarwin [
     "-DWITH_OPENCL=OFF"
     "-DWITH_LAPACK=OFF"
-    "-DBUILD_opencv_videoio=OFF"
   ] ++ lib.optionals enablePython [
     "-DOPENCV_SKIP_PYTHON_LOADER=ON"
   ] ++ lib.optionals enableEigen [