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-22 22:06:44 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-23 20:22:14 +0200
commitf6f2f38a6e782b981bca42e4c98e0a918625a711 (patch)
treead89920ea0ce97979fca673bb6a895ed7634ec01 /pkgs/applications/video/vlc/default.nix
parentcbd8f7093bc398103be51c07cca74ea832598dc3 (diff)
downloadnixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.gz
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.bz2
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.lz
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.xz
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.zst
nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.zip
jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

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 2c5b53c596a..4b42bcd2859 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