BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jack: change package and attr names to 'jack1' and 'jack2'

Browse source 
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
This commit is contained in:
Bjørn Forsman 2014-07-22 22:06:44 +02:00
parent cbd8f7093b
commit f6f2f38a6e
56 changed files with 121 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/a2jmidid/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }:
{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
};
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
buildInputs = [ alsaLib dbus jack2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";

4
pkgs/applications/audio/ardour/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil

4
pkgs/applications/audio/bristol/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }:
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }:
stdenv.mkDerivation rec {
name = "bristol-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto
];

4
pkgs/applications/audio/calf/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "calf-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH
libglade lv2 pkgconfig
];

4
pkgs/applications/audio/distrho/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2
, libxslt, lv2, pkgconfig, premake3, xlibs }:
let
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3
alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender
];

4
pkgs/applications/audio/drumkv1/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";

4
pkgs/applications/audio/fluidsynth/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
, pulseaudio }:
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";

4
pkgs/applications/audio/guitarix/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk
, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2
, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2
, pkgconfig, python }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2
ladspaH librdf libsndfile lv2 pkgconfig python
];

4
pkgs/applications/audio/hydrogen/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins
{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf
alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
libsndfile pkgconfig qt4 scons subversion
];

4
pkgs/applications/audio/ingen/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
, lv2, pkgconfig, python, raul, serd, sord, sratom, suil
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python
boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
raul serd sord sratom suil
];

4
pkgs/applications/audio/jack-capture/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }:
{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_capture-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
buildInputs = [ jackaudio libsndfile pkgconfig ];
buildInputs = [ jack2 libsndfile pkgconfig ];
buildPhase = "PREFIX=$out make jack_capture";

4
pkgs/applications/audio/jack-oscrolloscope/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
buildInputs = [ SDL jackaudio mesa pkgconfig ];
buildInputs = [ SDL jack2 mesa pkgconfig ];
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/audio/jack-rack/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }:
{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ];
buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

4
pkgs/applications/audio/jackmeter/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, pkgconfig }:
{ stdenv, fetchurl, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "jackmeter-0.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
buildInputs = [ jackaudio pkgconfig ];
buildInputs = [ jack2 pkgconfig ];
meta = {
description = "Console jack loudness meter";

4
pkgs/applications/audio/jalv/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python
{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil
gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";

4
pkgs/applications/audio/lash/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2
{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2
, makeWrapper, pkgconfig, readline }:
assert libuuid != null;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper
pkgconfig readline ];
postInstall = ''

4
pkgs/applications/audio/linuxsampler/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }:
, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib asio autoconf automake bison jackaudio libgig libsndfile
alsaLib asio autoconf automake bison jack2 libgig libsndfile
libtool lv2 pkgconfig
];

4
pkgs/applications/audio/lmms/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg
, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate
SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
libsndfile pkgconfig pulseaudio qt4
];

4
pkgs/applications/audio/mhwaveedit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH
{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio
];

4
pkgs/applications/audio/milkytracker/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl
, zlib, zziplib
}:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
export CPATH=${zlib}/lib
'';
buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ];
buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II.";

10
pkgs/applications/audio/moc/default.nix
View file

@ -1,4 +1,7 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
, libtool
}:
stdenv.mkDerivation rec {
name = "moc-${version}";
@ -11,7 +14,10 @@ stdenv.mkDerivation rec {
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
buildInputs = [
ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
];
meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";

4
pkgs/applications/audio/petrifoo/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas
{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs
[ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig
];

4
pkgs/applications/audio/projectm/default.nix
View file

@ -2,7 +2,7 @@
, glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
, withJack ? false, jackaudio
, withJack ? false, jack2
, withPulseAudio ? true, pulseaudio
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation {
[ glew ftgl ]
++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jackaudio
++ optional withJack jack2
++ optional withPulseAudio pulseaudio
;
}

4
pkgs/applications/audio/puredata/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
, alsaLib, jackaudio, tk
, alsaLib, jack2, tk
}:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
buildInputs = [ alsaLib jackaudio ];
buildInputs = [ alsaLib jack2 ];
configureFlags = ''
--enable-alsa

4
pkgs/applications/audio/qjackctl/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }:
stdenv.mkDerivation rec {
version = "0.3.10";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw";
};
buildInputs = [ qt4 alsaLib jackaudio dbus ];
buildInputs = [ qt4 alsaLib jack2 dbus ];
configureFlags = "--enable-jack-version";

4
pkgs/applications/audio/qsynth/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }:
{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }:
stdenv.mkDerivation rec {
name = "qsynth-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
};
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ];
buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
meta = with stdenv.lib; {
description = "Fluidsynth GUI";

4
pkgs/applications/audio/qtractor/default.nix
View file

@ -1,4 +1,4 @@
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib autoconf automake dssi gtk jackaudio ladspaH
[ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis pkgconfig qt4 rubberband
];

4
pkgs/applications/audio/rakarrack/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft,
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft,
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ];
buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg
buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; {

4
pkgs/applications/audio/samplv1/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";

4
pkgs/applications/audio/seq24/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }:
{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }:
stdenv.mkDerivation rec {
name = "seq24-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258";
};
buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ];
buildInputs = [ alsaLib gtkmm jack2 pkgconfig ];
meta = with stdenv.lib; {
description = "minimal loop based midi sequencer";

4
pkgs/applications/audio/setbfree/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2
{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2
, mesa, pkgconfig, ttf_bitstream_vera
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig
alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig
ttf_bitstream_vera
];

4
pkgs/applications/audio/sonic-visualiser/default.nix
View file

@ -1,6 +1,6 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sord
pkgconfig
# optional
jackaudio
jack2
# portaudio
pulseaudio
libmad

4
pkgs/applications/audio/synthv1/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
{ stdenv, fetchurl, qt4, jack2, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc";
};
buildInputs = [ qt4 jackaudio lv2 ];
buildInputs = [ qt4 jack2 lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";

4
pkgs/applications/audio/vmpk/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, qt4, jackaudio
, qt4, jack2
}:
let
@ -22,5 +22,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 jackaudio ];
buildInputs = [ qt4 jack2 ];
}

4
pkgs/applications/audio/xsynth-dssi/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio,
{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2,
ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH
buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo pkgconfig ];
installPhase = ''

4
pkgs/applications/audio/yoshimi/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib
, jack2, libsndfile, mesa, minixml, pkgconfig, zlib
}:
assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa
alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib
];

4
pkgs/applications/audio/zynaddsubfx/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml
{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml
, pkgconfig, zlib
}:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
};
buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ];
buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; {

4
pkgs/applications/misc/blender/default.nix
View file

@ -2,7 +2,7 @@
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw
, jackaudioSupport ? false, jackaudio
, jackaudioSupport ? false, jack2
}:
with lib;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ++ optional jackaudioSupport jackaudio;
] ++ optional jackaudioSupport jack2;
postUnpack =
''

6
pkgs/applications/networking/mumble/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
, speex, libopus, avahi, pkgconfig
, jackSupport ? false
, jackaudio ? null
, jack2 ? null
, speechdSupport ? false
, speechd ? null
}:
assert jackSupport -> jackaudio != null;
assert jackSupport -> jack2 != null;
assert speechdSupport -> speechd != null;
let
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 boost protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (optional jackSupport jackaudio)
++ (optional jackSupport jack2)
++ (optional speechdSupport speechd);
installPhase = ''

6
pkgs/applications/video/mplayer/default.nix
View file

@ -15,7 +15,7 @@
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, pulseSupport ? false, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -40,7 +40,7 @@ assert lameSupport -> lame != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
++ optional dvdnavSupport libdvdnav
++ optional bluraySupport libbluray
++ optional cddaSupport cdparanoia
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optionals amrSupport [ amrnb amrwb ]
++ optional x264Support x264
++ optional pulseSupport pulseaudio

6
pkgs/applications/video/mplayer2/default.nix
View file

@ -10,7 +10,7 @@
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -28,7 +28,7 @@ assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
++ optional xineramaSupport libXinerama
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau

6
pkgs/applications/video/mpv/default.nix
View file

@ -14,7 +14,7 @@
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? true, jackaudio ? null
, jackaudioSupport ? true, jack2 ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
++ optional dvdreadSupport libdvdread
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau

4
pkgs/applications/video/simplescreenrecorder/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext
{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext
, libXfixes, mesa, pkgconfig, pulseaudio, qt4
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig
alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
pulseaudio qt4
];

4
pkgs/applications/video/vlc/default.nix
View file

@ -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

4
pkgs/development/interpreters/supercollider/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, jackaudio, libsndfile, fftw, curl
, jack2, libsndfile, fftw, curl
, libXt, qt, readline
, useSCEL ? false, emacs
}:
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
jackaudio libsndfile fftw curl libXt qt readline ]
jack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs;
}

4
pkgs/development/libraries/aubio/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate
, libsndfile, pkgconfig, python
}:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
];
configurePhase = "python waf configure --prefix=$out";

2
pkgs/development/libraries/dssi/default.nix
View file

@ -1,5 +1,5 @@
x@{builderDefsPackage
, ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM
, ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
, libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
, ...}:
builderDefsPackage

4
pkgs/development/libraries/haskell/jack/default.nix
View file

@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, enumset, eventList, explicitException, jackaudio, midi
{ cabal, enumset, eventList, explicitException, jack2, midi
, nonNegative, transformers
}:
@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
buildDepends = [
enumset eventList explicitException midi nonNegative transformers
];
pkgconfigDepends = [ jackaudio ];
pkgconfigDepends = [ jack2 ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/JACK";
description = "Bindings for the JACK Audio Connection Kit";

4
pkgs/misc/emulators/mednafen/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libX11, mesa, freeglut
, jackaudio, libcdio, libsndfile, libsamplerate
, jack2, libcdio, libsndfile, libsamplerate
, SDL, SDL_net, zlib
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with stdenv.lib;
[ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ];
[ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
nativeBuildInputs = [ pkgconfig ];

2
pkgs/misc/jackaudio/default.nix
View file

@ -5,7 +5,7 @@
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jackdbus-${version}";
name = "jack2-${version}";
version = "1.9.9.5";
src = fetchurl {

2
pkgs/misc/jackaudio/jack1.nix
View file

@ -4,7 +4,7 @@
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jack-${version}";
name = "jack1-${version}";
version = "0.121.3";
src = fetchurl {

4
pkgs/os-specific/linux/alsa-plugins/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }:
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }:
stdenv.mkDerivation rec {
name = "alsa-plugins-1.0.28";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig alsaLib libogg ]
++ stdenv.lib.optional (pulseaudio != null) pulseaudio
++ stdenv.lib.optional (jackaudio != null) jackaudio;
++ stdenv.lib.optional (jack2 != null) jack2;
meta = {
description = "Various plugins for ALSA";

6
pkgs/servers/pulseaudio/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
, bluez, sbc, udev, libcap, json_c
, jackaudioSupport ? false, jackaudio ? null
, jackaudioSupport ? false, jack2 ? null
, x11Support ? false, xlibs
, useSystemd ? false, systemd ? null }:
assert jackaudioSupport -> jackaudio != null;
assert jackaudioSupport -> jack2 != null;
stdenv.mkDerivation rec {
name = "pulseaudio-5.0";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
speex json_c ]
++ stdenv.lib.optional jackaudioSupport jackaudio
++ stdenv.lib.optional jackaudioSupport jack2
++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
++ stdenv.lib.optional useSystemd systemd
++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ];

6
pkgs/tools/misc/timidity/default.nix
View file

@ -1,4 +1,4 @@
{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }:
let inherit (composableDerivation) edf; in
@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
};
jack = {
audioModes = "jack";
buildInputs = [jackaudio];
NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"];
buildInputs = [jack2];
NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
};
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};

6
pkgs/top-level/all-packages.nix
View file

@ -7009,7 +7009,7 @@ let
alsaLib = callPackage ../os-specific/linux/alsa-lib { };
alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
jackaudio = null;
jack2 = null;
};
alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
@ -11004,9 +11004,9 @@ let
hplipWithPlugin = hplip.override { withPlugin = true; };
# using the new configuration style proposal which is unstable
jack1d = callPackage ../misc/jackaudio/jack1.nix { };
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
jackaudio = callPackage ../misc/jackaudio { };
jack2 = callPackage ../misc/jackaudio { };
keynav = callPackage ../tools/X11/keynav { };

2
pkgs/top-level/python-packages.nix
View file

@ -2654,7 +2654,7 @@ rec {
sed -i "/use_setuptools/d" setup.py
'';
buildInputs = [ pkgs.alsaLib pkgs.jackaudio ];
buildInputs = [ pkgs.alsaLib pkgs.jack2 ];
meta = with stdenv.lib; {
description = "A Python wrapper for the RtMidi C++ library written with Cython";