From e7afac83c95c7ac03a1d82c5bdd94feebb44aec8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 6 Sep 2016 04:58:34 -0400 Subject: [PATCH] ffmpeg3: fix darwin build (#18350) --- pkgs/development/libraries/ffmpeg/3.1.nix | 3 ++- .../development/libraries/ffmpeg/sdk_detection.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ffmpeg/sdk_detection.patch diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index c0e70f1f3486..fd5ce7c19d84 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -1,4 +1,4 @@ -{ callPackage +{ stdenv, callPackage # Darwin frameworks , Cocoa, CoreMedia , ... @@ -9,4 +9,5 @@ callPackage ./generic.nix (args // rec { branch = "3.1"; sha256 = "0f4ajs0c4088nkal4gqagx05wfyhd1izfxmzxxsdh56ibp38kg2q"; darwinFrameworks = [ Cocoa CoreMedia ]; + patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; }) diff --git a/pkgs/development/libraries/ffmpeg/sdk_detection.patch b/pkgs/development/libraries/ffmpeg/sdk_detection.patch new file mode 100644 index 000000000000..f0b8789c66b5 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/sdk_detection.patch @@ -0,0 +1,12 @@ +diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c +--- a/libavcodec/audiotoolboxdec.c ++++ b/libavcodec/audiotoolboxdec.c +@@ -32,7 +32,7 @@ + #include "libavutil/opt.h" + #include "libavutil/log.h" + +-#ifndef __MAC_10_11 ++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 + #define kAudioFormatEnhancedAC3 'ec-3' + #endif +