Skip to content

Commit 1966a0a

Browse files
committed
opencv: enable videoio on darwin
1 parent 9e7d5d9 commit 1966a0a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pkgs/development/libraries/opencv/4.x.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
, enableDC1394 ? false, libdc1394
3232
, enableDocs ? false, doxygen, graphviz-nox
3333

34-
, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
34+
, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2
3535
}:
3636

3737
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
@@ -217,7 +217,7 @@ stdenv.mkDerivation {
217217
++ lib.optionals enableTesseract [ tesseract leptonica ]
218218
++ lib.optional enableTbb tbb
219219
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]
220-
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
220+
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ]
221221
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
222222

223223
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -255,7 +255,6 @@ stdenv.mkDerivation {
255255
] ++ lib.optionals stdenv.isDarwin [
256256
"-DWITH_OPENCL=OFF"
257257
"-DWITH_LAPACK=OFF"
258-
"-DBUILD_opencv_videoio=OFF"
259258
] ++ lib.optionals enablePython [
260259
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
261260
];

pkgs/top-level/all-packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -14567,7 +14567,7 @@ in
1456714567
};
1456814568

1456914569
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
14570-
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
14570+
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
1457114571
};
1457214572

1457314573
opencv = opencv4;

0 commit comments

Comments
 (0)