diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-06 04:15:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 04:15:23 +0000 |
| commit | 42b71b220e5131122f62526167b0439050d762de (patch) | |
| tree | 5732985f79c9dfd4c4dd6d06c0b5b966ba4ef283 | |
| parent | 856df0e074545c91b5b832eac96f3d665847ac73 (diff) | |
| parent | 8e84172b2d298055af41ebca903794dce8f575d8 (diff) | |
| download | nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar.gz nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar.bz2 nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar.lz nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar.xz nixpkgs-42b71b220e5131122f62526167b0439050d762de.tar.zst nixpkgs-42b71b220e5131122f62526167b0439050d762de.zip | |
Merge pull request #33502 from acowley/opencv-darwin-ffmpeg
opencv3: fix enableFfmpeg on darwin
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 2 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d34bae3012..ff1f0df9b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10303,7 +10303,7 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; 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 |