From c9a6d288b5bd0785b3263adfdd94c7c4396192f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 27 Sep 2015 10:01:11 -0500
Subject: [PATCH] vlc_qt5: build with Qt 5.5

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 732d8cd8a0a..e5db4c0b2db 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -8,13 +8,14 @@
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau, libsamplerate
 , onlyLibVLC ? false
-, qt4 ? null, qt5 ? null, withQt5 ? false
+, qt4 ? null
+, withQt5 ? false, qtbase ? null
 , jackSupport ? false
 }:
 
 with stdenv.lib;
 
-assert (withQt5 -> qt5 != null);
+assert (withQt5 -> qtbase != null);
 assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
       xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
       libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
     ]
-    ++ (if withQt5 then with qt5; [ base ] else [qt4])
+    ++ [(if withQt5 then qtbase else qt4)]
     ++ optional jackSupport libjack2;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb66abbcadd..aab4f19ff76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7916,6 +7916,11 @@ let
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
+    vlc = callPackage ../applications/video/vlc {
+      qt4 = null;
+      withQt5 = true;
+    };
+
   };
 
   qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;
@@ -13051,9 +13056,7 @@ let
     ffmpeg = ffmpeg_2;
   };
 
-  vlc_qt5 = vlc.override {
-    withQt5 = true;
-  };
+  vlc_qt5 = qt5Libs.vlc;
 
   vmpk = callPackage ../applications/audio/vmpk { };