diff options
| author | Guillaume Maudoux <layus.on@gmail.com> | 2016-04-12 09:45:44 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <layus.on@gmail.com> | 2016-04-12 15:55:44 +0200 |
| commit | 43cf5d3369d41c35ab94eae0db3d384051292280 (patch) | |
| tree | 114d394833d130a3bb93a685e21f008560c73da5 | |
| parent | 5c043134517c7e8000d896df70b191ff0630fcf2 (diff) | |
| download | nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar.gz nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar.bz2 nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar.lz nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar.xz nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.tar.zst nixlib-43cf5d3369d41c35ab94eae0db3d384051292280.zip | |
vlc: fixes the two windows issue with qt5
Fixes #14610.
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a84f24a303a2..a23bb9a1a942 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 ]; |