opencv3: fix enableFfmpeg on darwin

The VideoDecodeAcceleration framework and bzip2 library are needed
when enableFfmpeg is set to true on darwin.
This commit is contained in:
Anthony Cowley
2018-01-05 20:32:04 -05:00
parent 310ad4345b
commit 8e84172b2d
2 changed files with 4 additions and 2 deletions

View File

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