summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorAnthony Cowley <acowley@gmail.com>2016-03-11 15:12:55 -0500
committerAnthony Cowley <acowley@gmail.com>2016-04-15 18:21:33 -0400
commit184a3957e6a476e6f81abee552856861118ce85b (patch)
tree05b4d3c87ce7cf0de91b11868c1a3494e6519776 /pkgs/top-level/all-packages.nix
parentca1d46f98a71d3b21de0b9a30f759a7af2514f61 (diff)
downloadnixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar.gz
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar.bz2
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar.lz
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar.xz
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.tar.zst
nixpkgs-184a3957e6a476e6f81abee552856861118ce85b.zip
ffmpeg-full: avfoundation indev support on darwin
Adds support for camera input devices on OS X.

This required fixing links in output libraries and executables to pull
in the system's CoreFoundation.framework rather than the open source CF
one.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e44ac3e0bb..5cf8a5b7448 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6705,7 +6705,9 @@ in
     vid-stab = if stdenv.isDarwin then null else vid-stab;
     x265 = if stdenv.isDarwin then null else x265;
     xavs = if stdenv.isDarwin then null else xavs;
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices;
+    inherit (darwin) CF;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation
+                                          MediaToolbox VideoDecodeAcceleration;
   };
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };