diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-06-16 09:07:06 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-06-18 14:56:19 +1000 |
| commit | 05c4c9e72931e25ba8615c6377f718680c470b87 (patch) | |
| tree | 44001e63a76a4581d51e3e7b1aadc91db9e9dadb /pkgs/development/libraries/ffmpeg-full | |
| parent | f9e5ca8e58d6cddb182cb155be079829898d1a2d (diff) | |
| download | nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar.gz nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar.bz2 nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar.lz nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar.xz nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.tar.zst nixpkgs-05c4c9e72931e25ba8615c6377f718680c470b87.zip | |
ffmpeg-full: drop unneeded patch
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 95be159b2e1..666aafef7f4 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -242,8 +242,6 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; - patches = [ ./prefer-libdav1d-over-libaom.patch ]; - prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch b/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch deleted file mode 100644 index 789bfc2674f..00000000000 --- a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index d2f9a39ce5..2342399a8e 100644 ---- a/libavcodec/allcodecs.c -+++ b/libavcodec/allcodecs.c -@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder; - extern AVCodec ff_pcm_mulaw_at_decoder; - extern AVCodec ff_qdmc_at_decoder; - extern AVCodec ff_qdm2_at_decoder; -+extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libaom_av1_decoder; - extern AVCodec ff_libaom_av1_encoder; - extern AVCodec ff_libaribb24_decoder; - extern AVCodec ff_libcelt_decoder; - extern AVCodec ff_libcodec2_encoder; - extern AVCodec ff_libcodec2_decoder; --extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libdavs2_decoder; - extern AVCodec ff_libfdk_aac_encoder; - extern AVCodec ff_libfdk_aac_decoder; |