JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #97633 from marsam/enable-opencv-videoio-darwin

Browse Source 
opencv: enable videoio on darwin
This commit is contained in:
Mario Rodas 2020-09-15 22:57:37 -05:00 committed by GitHub
commit 7dbc32359d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/opencv/4.x.nix
View File

@ -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"
];

2
pkgs/top-level/all-packages.nix
View File

@ -14588,7 +14588,7 @@ in
};
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
};
opencv = opencv4;