public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #13977: ffmpeg: add 3.0 version

Browse Source 
I made the default not change for now.
This commit is contained in:
Vladimír Čunát 2016-06-09 14:09:22 +02:00
commit cbca34b1a7
2 changed files with 11 additions and 0 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}.2";
branch = "3.0";
sha256 = "0dpx15001ha9p8h8vfg1lm9pggbc96kmb546hz88wdac5xycgqrh";
})

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

@ -6947,10 +6947,14 @@ in
ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
ffmpeg_3_0 = callPackage ../development/libraries/ffmpeg/3.0.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
# Aliases # Aliases
ffmpeg_0 = self.ffmpeg_0_10; ffmpeg_0 = self.ffmpeg_0_10;
ffmpeg_1 = self.ffmpeg_1_2; ffmpeg_1 = self.ffmpeg_1_2;
ffmpeg_2 = self.ffmpeg_2_8; ffmpeg_2 = self.ffmpeg_2_8;
ffmpeg_3 = self.ffmpeg_3_0;
ffmpeg = self.ffmpeg_2; ffmpeg = self.ffmpeg_2;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {