summary refs log tree commit diff
path: root/pkgs/applications/video/vlc/default.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-07-31 12:47:17 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-31 12:52:29 +0200
commit62d0a320b32539a6b9efa868183f27f215aa2917 (patch)
tree45b9d3fa78640bb0a3591f1a9efb12970690836b /pkgs/applications/video/vlc/default.nix
parent10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff)
downloadnixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.gz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.bz2
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.lz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.xz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.zst
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.zip
Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d98544ab37741f740dd3516023924b27.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
Diffstat (limited to 'pkgs/applications/video/vlc/default.nix')
-rw-r--r--pkgs/applications/video/vlc/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 3c197d43a7d..71db3d40a46 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
-, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
+, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
       libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+      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