diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-09-10 00:00:00 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-09-10 00:00:00 -0500 |
| commit | 1966a0a4e1c1e07991406e3b90e3b088df252aea (patch) | |
| tree | 46abcc69ac8ae0f6f94daa6582984dedef391e14 /pkgs/development/libraries/opencv | |
| parent | 9e7d5d9af47a1f939543483cb9fc58b2c933c9c0 (diff) | |
| download | nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar.gz nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar.bz2 nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar.lz nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar.xz nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.tar.zst nixpkgs-1966a0a4e1c1e07991406e3b90e3b088df252aea.zip | |
opencv: enable videoio on darwin
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a2cd75093ce..adeab6b4494 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -31,7 +31,7 @@ , enableDC1394 ? false, libdc1394 , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 +, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; @@ -217,7 +217,7 @@ stdenv.mkDerivation { ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] - ++ 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; @@ -255,7 +255,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" ]; |