diff options
author | Cray Elliott <MP2E@archlinux.us> | 2017-12-17 23:00:05 -0800 |
---|---|---|
committer | Cray Elliott <MP2E@archlinux.us> | 2017-12-17 23:00:05 -0800 |
commit | c1e8fea4fcc1531265319ea1d8fe31448ec36769 (patch) | |
tree | 2613f1136bd63957852031d3937776da0125709e /pkgs/development/libraries/ffmpeg-full | |
parent | 2e2c2cad6c51588328b72f955d4ef1332623b786 (diff) |
ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
also remove CVE patch, it is upstream in v3.4.1
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
-rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d131fc13ced37..780008c95001c 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,21 +231,13 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"; + sha256 = "1h4iz7q10wj04awr2wvmp60n7b09pfwrgwbbw9sgl7klcf52fxss"; }; - 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 '' |