diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2016-04-23 15:24:21 +0200 |
|---|---|---|
| committer | Wout Mertens <Wout.Mertens@gmail.com> | 2016-04-23 15:24:21 +0200 |
| commit | 017469c1ef4865d9e884009973d645602d1c5405 (patch) | |
| tree | 0efa54198d0146015e9dd29b9e7260641f1765a8 /pkgs/top-level/all-packages.nix | |
| parent | b843ef426c5bb348864c0cb6bd42d4752e3a0a42 (diff) | |
| parent | 184a3957e6a476e6f81abee552856861118ce85b (diff) | |
| download | nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar.gz nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar.bz2 nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar.lz nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar.xz nixlib-017469c1ef4865d9e884009973d645602d1c5405.tar.zst nixlib-017469c1ef4865d9e884009973d645602d1c5405.zip | |
Merge pull request #14036 from acowley/darwin-ffmpeg
Darwin ffmpeg
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdfd78abb83f..fc5b11fdbd35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6717,7 +6717,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 { }; |