ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge #25382: ffmpeg: remove darwin patch

Browse Source
This commit is contained in:
Vladimír Čunát 2017-05-01 17:43:10 +02:00
commit ba4fd61630
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
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";
sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
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