mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
ffmpeg: 2.8.5 -> 3.0
This commit is contained in:
parent
abcf57a8db
commit
140e48f3c1
7
pkgs/development/libraries/ffmpeg/3.0.nix
Normal file
7
pkgs/development/libraries/ffmpeg/3.0.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{ callPackage, ... } @ args:
|
||||||
|
|
||||||
|
callPackage ./generic.nix (args // rec {
|
||||||
|
version = "${branch}";
|
||||||
|
branch = "3.0";
|
||||||
|
sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
|
||||||
|
})
|
|
@ -6716,11 +6716,15 @@ let
|
||||||
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 = ffmpeg_0_10;
|
ffmpeg_0 = ffmpeg_0_10;
|
||||||
ffmpeg_1 = ffmpeg_1_2;
|
ffmpeg_1 = ffmpeg_1_2;
|
||||||
ffmpeg_2 = ffmpeg_2_8;
|
ffmpeg_2 = ffmpeg_2_8;
|
||||||
ffmpeg = ffmpeg_2;
|
ffmpeg_3 = ffmpeg_3_0;
|
||||||
|
ffmpeg = ffmpeg_3;
|
||||||
|
|
||||||
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
|
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
|
||||||
# The following need to be fixed on Darwin
|
# The following need to be fixed on Darwin
|
||||||
|
|
Loading…
Reference in a new issue