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

Merge pull request #33502 from acowley/opencv-darwin-ffmpeg

Browse Source 
opencv3: fix enableFfmpeg on darwin
This commit is contained in:
Orivej Desh 2018-01-06 04:15:23 +00:00 committed by GitHub
commit 42b71b220e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
, enableTesseract ? false, tesseract, leptonica , enableTesseract ? false, tesseract, leptonica
, enableDocs ? false, doxygen, graphviz-nox , enableDocs ? false, doxygen, graphviz-nox
, AVFoundation, Cocoa, QTKit , AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
}: }:
let let
@ -168,6 +168,8 @@ stdenv.mkDerivation rec {
++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optionals enableEXR [ openexr ilmbase ]
++ lib.optional enableJPEG2K jasper ++ lib.optional enableJPEG2K jasper
++ lib.optional enableFfmpeg ffmpeg ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
[ VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
++ lib.optional enableOpenblas openblas ++ lib.optional enableOpenblas openblas

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

@ -10303,7 +10303,7 @@ with pkgs;
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
enableCuda = config.cudaSupport or false; enableCuda = config.cudaSupport or false;
cudatoolkit = cudatoolkit8; cudatoolkit = cudatoolkit8;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
}; };
# this ctl version is needed by openexr_viewers # this ctl version is needed by openexr_viewers