From 00b05d47d30fff2ca1925ec38078907b95c6cb69 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 7 Aug 2016 12:25:01 +0200
Subject: [PATCH] ffmpeg: add extra darwin framework for 3.1

---
 pkgs/development/libraries/ffmpeg/3.1.nix     | 7 ++++++-
 pkgs/development/libraries/ffmpeg/generic.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index 25892e186843..84e6f57c523a 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -1,7 +1,12 @@
-{ callPackage, ... } @ args:
+{ callPackage
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.1";
   branch = "3.1";
   sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
+  darwinFrameworks = [ Cocoa CoreMedia ];
 })
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0c4e9df3df19..33ee2f80a6ed 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -13,7 +13,7 @@
 , optimizationsDeveloper ? true
 , extraWarningsDeveloper ? false
 # Darwin frameworks
-, Cocoa
+, Cocoa, darwinFrameworks ? [ Cocoa ]
 # Inherit generics
 , branch, sha256, version, patches ? [], ...
 }:
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
     ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isArm) libva
     ++ optional isLinux alsaLib
-    ++ optional isDarwin Cocoa
+    ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
     ++ optional sdlSupport SDL;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b64a339dc088..714b68b8ed17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7172,7 +7172,7 @@ in
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
   ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
   # Aliases
   ffmpeg_0 = self.ffmpeg_0_10;