1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00

vlc: 2.2.6 -> 2.2.8

This commit is contained in:
Peter Hoeg 2017-12-21 08:18:52 +08:00
parent 8c7e721467
commit 662bfa145a

View file

@ -21,21 +21,13 @@ assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vlc-${version}"; name = "vlc-${version}";
version = "2.2.6"; version = "2.2.8";
src = fetchurl { src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v";
}; };
patches = [
(fetchpatch {
name = "CVE-2017-9300.patch";
url = "https://git.videolan.org/?p=vlc/vlc-2.2.git;a=patch;h=55a82442cfea9dab8b853f3a4610f2880c5fadf3;hp=dbe888f9ca9c3b102478b4a16a3d1d985c267899";
sha256 = "0l0fwqkn31lggwc5dkhb58gkv8pc6ng51y0izjigqvfqvhwdnzxn";
})
];
# Comment-out the Qt 5.5 version check, as we do apply the relevant patch. # Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
# https://trac.videolan.org/vlc/ticket/16497 # https://trac.videolan.org/vlc/ticket/16497
postPatch = if (!withQt5) then null else postPatch = if (!withQt5) then null else