From 0ffe146ed3b3c3b5fb97594649057e21cc3f0152 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 1 May 2017 13:31:00 +0200 Subject: [PATCH] ffmpeg: remove darwin patch --- pkgs/development/libraries/ffmpeg/3.3.nix | 1 - .../development/libraries/ffmpeg/sdk_detection.patch | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/sdk_detection.patch diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index c3aa8de4e1e6..03bb9d44dda9 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -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; }) diff --git a/pkgs/development/libraries/ffmpeg/sdk_detection.patch b/pkgs/development/libraries/ffmpeg/sdk_detection.patch deleted file mode 100644 index f0b8789c66b5..000000000000 --- a/pkgs/development/libraries/ffmpeg/sdk_detection.patch +++ /dev/null @@ -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 -