From ab8a2b0c78d2dda116e922f34162ef3a3e493ec1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Jun 2015 12:19:37 +0200 Subject: [PATCH] vlc: Don't depend on JACK by default To reduce dependency bloat, packages should not depend on non-standard audio systems by default. --- pkgs/applications/video/vlc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 85fc6f6b6ba..adf5aed3f55 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 ];