public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: remove darwin patch

This commit is contained in:
Daiderd Jordan 2017-05-01 13:31:00 +02:00
parent 08e484c444
commit 0ffe146ed3
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/ffmpeg/3.3.nix
View File

@ -9,5 +9,4 @@ callPackage ./generic.nix (args // rec {
branch = "3.3"; branch = "3.3";
sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11"; sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
}) })

12
pkgs/development/libraries/ffmpeg/sdk_detection.patch
View File

@ -1,12 +0,0 @@
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