From aa12640cb913051f646d2422cfdad97616fdb4a0 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Thu, 29 Oct 2015 15:15:42 +0200 Subject: [PATCH] darwin: ffmpeg: add needed inputs --- pkgs/development/libraries/ffmpeg/generic.nix | 5 ++++- pkgs/top-level/all-packages.nix | 20 ++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 99d8fe679ab3..d84073f10004 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -10,6 +10,8 @@ , debugDeveloper ? false , optimizationsDeveloper ? true , extraWarningsDeveloper ? false +# Darwin frameworks +, Cocoa # Inherit generics , branch, sha256, version, ... }: @@ -141,7 +143,8 @@ stdenv.mkDerivation rec { ] ++ optional openglSupport mesa ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin ++ optional (isLinux || isFreeBSD) libva - ++ optional isLinux alsaLib; + ++ optional isLinux alsaLib + ++ optionals isDarwin [ Cocoa ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dcfb05a4be5..2c4ae620eca9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6227,11 +6227,21 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; - ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; - ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; - ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix { }; + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2;