diff options
| author | Anthony Cowley <acowley@gmail.com> | 2018-01-05 20:32:04 -0500 |
|---|---|---|
| committer | Anthony Cowley <acowley@gmail.com> | 2018-01-05 20:32:04 -0500 |
| commit | 8e84172b2d298055af41ebca903794dce8f575d8 (patch) | |
| tree | 44af5c6ad87026ffcf246a3dd7ef09a9fd44fd94 /pkgs/development/libraries/opencv | |
| parent | 310ad4345bbe42ae7360981243f6602a03fd232f (diff) | |
| download | nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar.gz nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar.bz2 nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar.lz nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar.xz nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.tar.zst nixpkgs-8e84172b2d298055af41ebca903794dce8f575d8.zip | |
opencv3: fix enableFfmpeg on darwin
The VideoDecodeAcceleration framework and bzip2 library are needed when enableFfmpeg is set to true on darwin.
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a9b3c85d396..bcb3bde5ad7 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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 |