mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

ffmpeg: 2.8.5 -> 3.0

Browse source
This commit is contained in:
Andrew Kelley 2016-03-16 16:09:22 -07:00
parent abcf57a8db
commit 140e48f3c1
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/3.0.nix Normal file
View file

@ -0,0 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "3.0";
sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
})

6
pkgs/top-level/all-packages.nix
View file

@ -6716,11 +6716,15 @@ let
ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
# Aliases
ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_8;
ffmpeg = ffmpeg_2;
ffmpeg_3 = ffmpeg_3_0;
ffmpeg = ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# The following need to be fixed on Darwin