mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

ffmpeg3: fix darwin build (#18350)

Browse source
This commit is contained in:
Dmitry Kalinkin 2016-09-06 04:58:34 -04:00 committed by vbgl
parent 28ceb0f31a
commit e7afac83c9
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/ffmpeg/3.1.nix
View file

@ -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;
})

12
pkgs/development/libraries/ffmpeg/sdk_detection.patch Normal file
View file

@ -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