diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
| commit | f1370041799b17454dc252d137795810edf37594 (patch) | |
| tree | c3a8dce88803a52060fe88c73fe7d2af4afa1cba /pkgs/applications/video/vlc | |
| parent | 3c3d8710b5d61baace6e412fd4b765a3a50e4188 (diff) | |
| parent | b465d9c1fff4e92d6790e10dafc6a578c44ac98e (diff) | |
| download | nixlib-f1370041799b17454dc252d137795810edf37594.tar nixlib-f1370041799b17454dc252d137795810edf37594.tar.gz nixlib-f1370041799b17454dc252d137795810edf37594.tar.bz2 nixlib-f1370041799b17454dc252d137795810edf37594.tar.lz nixlib-f1370041799b17454dc252d137795810edf37594.tar.xz nixlib-f1370041799b17454dc252d137795810edf37594.tar.zst nixlib-f1370041799b17454dc252d137795810edf37594.zip | |
Merge branch 'master' into staging
* master: (81 commits) Add NixOS 17.09 AMIs gradle: 4.2 -> 4.2.1 maintainers.nix: use my GitHub handle as maintainer name fcitx-engines.rime: init at 0.3.2 brise: init at 2017-09-16 librime: init at 1.2.9 marisa: init at 0.2.4 opencc: build shared library and programs josm: 12712 -> 12914 exa: 0.7.0 -> 0.8.0 krb5: add deprecation date for old configuration rustRegistry: 2017-09-10 -> 2017-10-03 go-ethereum: Fix libusb segmentation faults on Darwin tor-browser-bundle-bin: 7.0.5 -> 7.0.6 libsodium: 1.0.13 -> 1.0.15 tor-browser-bundle: geoip support tor-browser-bundle: support transports obfs2,obfs3 tor-browser-bundle: bump https-everywhere to 2017.9.12 tint2: limit platforms to Linux since macOS is not supported and fails the tests eclipse-plugin-vrapper: init at 0.72.0 ...
Diffstat (limited to 'pkgs/applications/video/vlc')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b806ff65ddb2..b465379c50ed 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -11,6 +11,7 @@ , qt4 ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false +, fetchpatch }: with stdenv.lib; @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"; }; + 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. # https://trac.videolan.org/vlc/ticket/16497 postPatch = if (!withQt5) then null else |