dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ffmpeg: 3.2.4 -> 3.3

Browse Source
This commit is contained in:
Cray Elliott 2017-04-22 18:48:06 -07:00
parent 5a9850cedd
commit 7172556e8d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/ffmpeg/3.3.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv, callPackage
# Darwin frameworks
, Cocoa, CoreMedia
, ...
}@args:
callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "3.3";
sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
darwinFrameworks = [ Cocoa CoreMedia ];
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
})

5
pkgs/top-level/all-packages.nix
View File

@ -7467,11 +7467,14 @@ with pkgs;
ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
};
ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
};
# Aliases
ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_8;
ffmpeg_3 = ffmpeg_3_2;
ffmpeg_3 = ffmpeg_3_3;
ffmpeg = ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {