alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

vlc: fixes the two windows issue with qt5

Browse source 
Fix a bug with vlc displaying video in a separate window.

(cherry picked from commit 43cf5d3369)
Reason: qt5.vlc is also broken on stable.
This commit is contained in:
Guillaume Maudoux 2016-04-12 09:45:44 +02:00
parent 4ffe3f9593
commit d3c950bf09
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
, 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 ];