diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-05-01 13:31:00 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-05-01 13:31:00 +0200 |
| commit | 0ffe146ed3b3c3b5fb97594649057e21cc3f0152 (patch) | |
| tree | 756753e9add5366fabc2ca187b4ad32da736575c /pkgs/development/libraries/ffmpeg | |
| parent | 08e484c44483dd5e880a0593f2f0dc8824da6725 (diff) | |
| download | nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar.gz nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar.bz2 nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar.lz nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar.xz nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.tar.zst nixpkgs-0ffe146ed3b3c3b5fb97594649057e21cc3f0152.zip | |
ffmpeg: remove darwin patch
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.3.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/sdk_detection.patch | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index c3aa8de4e1e..03bb9d44dda 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 f0b8789c66b..00000000000 --- 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 - |