From 362ba73ac68a1385f6e639ddfead4777767ed673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 28 Feb 2015 23:23:58 +0100
Subject: [PATCH] vlc: 2.1.5 -> 2.2.0

---
 pkgs/applications/video/vlc/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 82930eb8bd8..e25f833eabc 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -13,15 +13,16 @@
 
 with stdenv.lib;
 
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+assert (withQt5 -> qt5 != null);
+assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.1.5";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg";
+    sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
   };
 
   buildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90dbe36e100..d67b65af917 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11784,7 +11784,7 @@ let
   };
 
   vlc = callPackage ../applications/video/vlc {
-    ffmpeg = ffmpeg_2_2;
+    ffmpeg = ffmpeg_2;
   };
 
   vlc_qt5 = vlc.override {