diff options
author | William A. Kennington III <william@wkennington.com> | 2015-06-27 00:17:52 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-06-27 00:17:52 -0700 |
commit | 729725501922fad5955b86bf0e06a2f6fee659f6 (patch) | |
tree | 0c1035bd915dafc8c7d8635df1e865cff7689422 /pkgs/applications/video | |
parent | 8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 (diff) |
Convert all jack references to libjack2
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/simplescreenrecorder/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 57f8289a1f92d..a317e1d4fe527 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -17,7 +17,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null -, jackaudioSupport ? false, jack2 ? null +, jackaudioSupport ? false, libjack2 ? null , pulseSupport ? false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -44,7 +44,7 @@ assert lameSupport -> lame != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> libjack2 != null; assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ++ optional dvdnavSupport libdvdnav ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport libjack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 ++ optional pulseSupport libpulseaudio diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 03cb5154f8537..1be0f5b9e0ae1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -12,7 +12,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, jack2 ? null +, jackaudioSupport ? true, libjack2 ? null , pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null # For screenshots @@ -39,7 +39,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> libjack2 != null; assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ++ optional dvdreadSupport libdvdread ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport libjack2 ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 453829bc580e7..8560b83d5fa6c 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext +{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext , libXfixes, mesa, pkgconfig, libpulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig + alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig libpulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index adf5aed3f5533..ae7f71e607e31 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -3,7 +3,7 @@ , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image +, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libdc1394 libraw1394 libopus libebml libmatroska libvdpau ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) - ++ optional jackSupport jack2; + ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ]; |