From 43cf5d3369d41c35ab94eae0db3d384051292280 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 12 Apr 2016 09:45:44 +0200 Subject: [PATCH] vlc: fixes the two windows issue with qt5 Fixes #14610. --- pkgs/applications/video/vlc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a84f24a303a..a23bb9a1a94 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,13 +9,13 @@ , libvdpau, libsamplerate, live555, fluidsynth , onlyLibVLC ? false , qt4 ? null -, withQt5 ? false, qtbase ? null +, withQt5 ? false, qtbase ? null, qtx11extras ? null , jackSupport ? false }: with stdenv.lib; -assert (withQt5 -> qtbase != null); +assert (withQt5 -> qtbase != null && qtx11extras != null); assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { fluidsynth ] ++ [(if withQt5 then qtbase else qt4)] + ++ optional withQt5 qtx11extras ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ];