diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-28 21:06:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-28 21:06:44 +0100 |
| commit | 8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5 (patch) | |
| tree | a13ab612605f86b6d9cc7ff56ce27b7597bf1d86 /pkgs/development/libraries/ffmpeg-full | |
| parent | db6adec1562346f737babad36ccd11e5b23b3093 (diff) | |
| parent | e0368f5076abdedb671ef223d183d1a43b786e14 (diff) | |
| download | nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.gz nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.bz2 nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.lz nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.xz nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.zst nixpkgs-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c56e2e804f8..d131fc13ced 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm , hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) @@ -238,7 +238,16 @@ stdenv.mkDerivation rec { sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; }; - patchPhase = ''patchShebangs . + patches = [ + (fetchurl { + name = "CVE-2017-16840.patch"; + url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74"; + sha256 = "0zx0vh110hrykk7j863j04bx6igm2q8dlkv25mf5g4rbxafpqig3"; + }) + ]; + + prePatch = '' + patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c '' + stdenv.lib.optionalString (frei0r != null) '' |