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 | |
| parent | db6adec1562346f737babad36ccd11e5b23b3093 (diff) | |
| parent | e0368f5076abdedb671ef223d183d1a43b786e14 (diff) | |
| download | nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.gz nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.bz2 nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.lz nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.xz nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.tar.zst nixlib-8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 513654e98f74..9890d030e44e 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage +{ stdenv, callPackage, fetchpatch # Darwin frameworks , Cocoa, CoreMedia , ... @@ -9,4 +9,13 @@ callPackage ./generic.nix (args // rec { branch = "3.4"; sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax"; darwinFrameworks = [ Cocoa CoreMedia ]; + + patches = [ + (fetchpatch{ + name = "CVE-2017-16840.patch"; + url = "http://git.videolan.org/?p=ffmpeg.git;a=patch;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74"; + sha256 = "1rjr9lc71cyy43wsa2zxb9ygya292h9jflvr5wk61nf0vp97gjg3"; + }) + ]; + }) |