From 140e48f3c1986f8bb5820e9a9bef394b3908ac62 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 16 Mar 2016 16:09:22 -0700
Subject: [PATCH] ffmpeg: 2.8.5 -> 3.0
---
pkgs/development/libraries/ffmpeg/3.0.nix | 7 +++++++
pkgs/top-level/all-packages.nix | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 pkgs/development/libraries/ffmpeg/3.0.nix
diff --git a/pkgs/development/libraries/ffmpeg/3.0.nix b/pkgs/development/libraries/ffmpeg/3.0.nix
new file mode 100644
index 00000000000..e7d28bfc438
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/3.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "${branch}";
+ branch = "3.0";
+ sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaaab0b0e8..d7d70795530 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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