diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:50:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-11 07:50:23 +0200 |
| commit | 230c67f43bc36f6327163a603256278c71431688 (patch) | |
| tree | 50ba027cf075f05588194acf13ad5d1374ea64a4 /pkgs/development/libraries/ffmpeg | |
| parent | 932f1086a9a66885d57c7428540fc6731af58c61 (diff) | |
| parent | 99eddf32dca502ea35589c4e2faf847e373c8f44 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 4 |
1 files changed, 2 insertions, 2 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 ]; }) |