diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-25 09:15:05 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-25 09:15:05 -0500 |
| commit | a8c52d09583d72ff80663f0734c8c11e0f82ae48 (patch) | |
| tree | aa27c69fe5fd1cf9027fc764db59eb61f8fa3d13 /pkgs/applications/video | |
| parent | 3dd96b1a2ca5c7ac8ce9e1613852aa9ded43e6c1 (diff) | |
| parent | 99d20189b87f9caf0ce4155408e8789074e1430a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 85fc6f6b6ba77..adf5aed3f5533 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,6 +9,7 @@ , libvdpau , onlyLibVLC ? false , qt4 ? null, qt5 ? null, withQt5 ? false +, jackSupport ? false }: with stdenv.lib; @@ -29,11 +30,13 @@ stdenv.mkDerivation rec { [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib + udev gnutls avahi libcddb 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 with qt5; [ base ] else [qt4]); + ] + ++ (if withQt5 then with qt5; [ base ] else [qt4]) + ++ optional jackSupport jack2; nativeBuildInputs = [ pkgconfig ]; |