summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2014-11-17 19:33:10 -0600
committerThomas Tuegel <ttuegel@gmail.com>2014-11-20 11:11:12 -0600
commit66ebc65cd3fd91eba18e43e4cc37ddfecbddba95 (patch)
tree6328bce26116e122ffb04162b96435529d3b7de3 /pkgs/applications
parentb1123db790131f0c581401967942c55cba01d2e9 (diff)
downloadnixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar.gz
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar.bz2
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar.lz
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar.xz
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.tar.zst
nixpkgs-66ebc65cd3fd91eba18e43e4cc37ddfecbddba95.zip
phonon-backend-vlc: add Qt 5 support
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/video/vlc/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 71db3d40a46..f1d3cf836ad 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,14 +1,20 @@
 { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
-, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
+, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau
+, onlyLibVLC ? false
+, qt4 ? null, qt5 ? null, withQt5 ? false
 }:
 
+with stdenv.lib;
+
+assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
   version = "2.1.5";
@@ -20,13 +26,13 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-      libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+      libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
       libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
       udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
       libdc1394 libraw1394 libopus libebml libmatroska libvdpau
-    ];
+    ] ++ [(if withQt5 then qt5 else qt4)];
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -36,7 +42,8 @@ stdenv.mkDerivation rec {
       "--enable-dc1394"
       "--enable-ncurses"
       "--enable-vdpau"
-    ];
+    ]
+    ++ optional onlyLibVLC  "--disable-vlc";
 
   preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';