public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14615 from layus/vlc-fix

Browse Source 
vlc: fix the two windows issue with qt5
This commit is contained in:
joachifm 2016-04-13 01:59:44 +02:00
commit 53ff168dbd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/video/vlc/default.nix
View File

@ -9,13 +9,13 @@
, libvdpau, libsamplerate, live555, fluidsynth , libvdpau, libsamplerate, live555, fluidsynth
, onlyLibVLC ? false , onlyLibVLC ? false
, qt4 ? null , qt4 ? null
, withQt5 ? false, qtbase ? null , withQt5 ? false, qtbase ? null, qtx11extras ? null
, jackSupport ? false , jackSupport ? false
}: }:
with stdenv.lib; with stdenv.lib;
assert (withQt5 -> qtbase != null); assert (withQt5 -> qtbase != null && qtx11extras != null);
assert (!withQt5 -> qt4 != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
fluidsynth fluidsynth
] ]
++ [(if withQt5 then qtbase else qt4)] ++ [(if withQt5 then qtbase else qt4)]
++ optional withQt5 qtx11extras
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];