From 49c646cbf7a887541b4100e5808027721b681b2b Mon Sep 17 00:00:00 2001 From: ryan4729 <40183301+ryan4729@users.noreply.github.com> Date: Wed, 10 Apr 2019 22:09:45 -0700 Subject: [PATCH] ffmpeg_4: build with videotoolbox on darwin (#57743) --- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index d8a13a9c384d..7e2507d5afdf 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchpatch # Darwin frameworks -, Cocoa, CoreMedia +, Cocoa, CoreMedia, VideoToolbox , ... }@args: @@ -8,5 +8,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; branch = "4.1.2"; sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0"; - darwinFrameworks = [ Cocoa CoreMedia ]; + darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a45ea62a05cc..e743d1d0b6b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9957,7 +9957,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; }; # Aliases