colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove obsolete jackaudio version 1."

Browse Source 
This reverts commit bdb77826d9.

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
This commit is contained in:
Bjørn Forsman 2014-07-31 12:47:17 +02:00
parent 10d4f1fac7
commit 62d0a320b3
57 changed files with 149 additions and 116 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 { stdenv.mkDerivation rec {
name = "a2jmidid-${version}"; name = "a2jmidid-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
}; };
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; buildInputs = [ alsaLib dbus jack2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out"; 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 { 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 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc [ 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 libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil 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 { stdenv.mkDerivation rec {
name = "bristol-${version}"; name = "bristol-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto xlibs.xproto
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: , gtk, jack2, ladspaH , libglade, lv2, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calf-${version}"; name = "calf-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH
libglade lv2 pkgconfig 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 }: , libxslt, lv2, pkgconfig, premake3, xlibs }:
let let
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3 alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
xlibs.libXinerama xlibs.libXrender 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 { stdenv.mkDerivation rec {
name = "drumkv1-${version}"; name = "drumkv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq";
}; };
buildInputs = [ jackaudio libsndfile lv2 qt4 ]; buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx"; 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 }: , pulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio"; "-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ] buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications"; 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 { 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 }: , pkgconfig, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 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 }: , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
libsndfile pkgconfig qt4 scons subversion 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 , lv2, pkgconfig, python, raul, serd, sord, sratom, suil
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 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 { stdenv.mkDerivation rec {
name = "jack_capture-${version}"; name = "jack_capture-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
}; };
buildInputs = [ jackaudio libsndfile pkgconfig ]; buildInputs = [ jack2 libsndfile pkgconfig ];
buildPhase = "PREFIX=$out make jack_capture"; 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 { stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}"; name = "jack_oscrolloscope-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
}; };
buildInputs = [ SDL jackaudio mesa pkgconfig ]; buildInputs = [ SDL jack2 mesa pkgconfig ];
installPhase = '' installPhase = ''
mkdir -p $out/bin 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 { stdenv.mkDerivation rec {
name = "jack-rack-1.4.7"; name = "jack-rack-1.4.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
}; };
buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ]; buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ];
meta = { meta = {
description = ''An effects "rack" for the JACK low latency audio API''; 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 { stdenv.mkDerivation rec {
name = "jackmeter-0.4"; name = "jackmeter-0.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
}; };
buildInputs = [ jackaudio pkgconfig ]; buildInputs = [ jack2 pkgconfig ];
meta = { meta = {
description = "Console jack loudness meter"; 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 }: , serd, sord , sratom, suil }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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"; 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 }: , makeWrapper, pkgconfig, readline }:
assert libuuid != null; assert libuuid != null;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
patches = [ ./socket.patch ./gcc-47.patch ]; patches = [ ./socket.patch ./gcc-47.patch ];
buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper
pkgconfig readline ]; pkgconfig readline ];
postInstall = '' postInstall = ''

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

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: , jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}"; name = "linuxsampler-svn-${version}";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
alsaLib asio autoconf automake bison jackaudio libgig libsndfile alsaLib asio autoconf automake bison jack2 libgig libsndfile
libtool lv2 pkgconfig 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 , libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate
libsndfile pkgconfig pulseaudio qt4 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 }: , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio 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 , zlib, zziplib
}: }:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
export CPATH=${zlib}/lib export CPATH=${zlib}/lib
''; '';
buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ];
meta = { meta = {
description = "Music tracker application, similar to Fasttracker II."; description = "Music tracker application, similar to Fasttracker II.";

4
pkgs/applications/audio/moc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag , libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
, libtool , libtool
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
]; ];
meta = { meta = {

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 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }: , pkgconfig }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs [ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig libsamplerate libsndfile libtool libxml2 pkgconfig
]; ];

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

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

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
, alsaLib, jackaudio, tk , alsaLib, jack2, tk
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
buildInputs = [ alsaLib jackaudio ]; buildInputs = [ alsaLib jack2 ];
configureFlags = '' configureFlags = ''
--enable-alsa --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 { stdenv.mkDerivation rec {
version = "0.3.11"; version = "0.3.11";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl"; sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl";
}; };
buildInputs = [ qt4 alsaLib jackaudio dbus ]; buildInputs = [ qt4 alsaLib jack2 dbus ];
configureFlags = "--enable-jack-version"; 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 { stdenv.mkDerivation rec {
name = "qsynth-${version}"; name = "qsynth-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
}; };
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Fluidsynth GUI"; 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 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ alsaLib autoconf automake dssi gtk jackaudio ladspaH [ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis pkgconfig qt4 rubberband 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 }: libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ]; patches = [ ./fltk-path.patch ];
buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ]; libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; { 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 { stdenv.mkDerivation rec {
name = "samplv1-${version}"; name = "samplv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4";
}; };
buildInputs = [ jackaudio libsndfile lv2 qt4 ]; buildInputs = [ jack2 libsndfile lv2 qt4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; 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 { stdenv.mkDerivation rec {
name = "seq24-${version}"; name = "seq24-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258"; sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258";
}; };
buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ]; buildInputs = [ alsaLib gtkmm jack2 pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "minimal loop based midi sequencer"; 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 , mesa, pkgconfig, ttf_bitstream_vera
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig
ttf_bitstream_vera 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 # 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 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland , libsndfile, pkgconfig, pulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK , rubberband, serd, sord, vampSDK
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sord sord
pkgconfig pkgconfig
# optional # optional
jackaudio jack2
# portaudio # portaudio
pulseaudio pulseaudio
libmad 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 { stdenv.mkDerivation rec {
name = "synthv1-${version}"; name = "synthv1-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc";
}; };
buildInputs = [ qt4 jackaudio lv2 ]; buildInputs = [ qt4 jack2 lv2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; 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 { stdenv, fetchurl, cmake, pkgconfig
, qt4, jackaudio , qt4, jack2
}: }:
let let
@ -22,5 +22,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; 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 }: ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
}; };
buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH
ladspaPlugins liblo pkgconfig ]; ladspaPlugins liblo pkgconfig ];
installPhase = '' installPhase = ''

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib , jack2, libsndfile, mesa, minixml, pkgconfig, zlib
}: }:
assert stdenv ? glibc; assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa
minixml zlib 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 , pkgconfig, zlib
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
}; };
buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

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

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

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

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

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

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

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

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

@ -14,7 +14,7 @@
, bluraySupport ? true, libbluray ? null , bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
, jackaudioSupport ? true, jackaudio ? null , jackaudioSupport ? true, jack2 ? null
, pulseSupport ? true, pulseaudio ? null , pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null , bs2bSupport ? false, libbs2b ? null
# For screenshots # For screenshots
@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null; assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null; assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null; assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
++ optional dvdreadSupport libdvdread ++ optional dvdreadSupport libdvdread
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray ++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio ++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio ++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver ++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau ++ 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 , libXfixes, mesa, pkgconfig, pulseaudio, qt4
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
pulseaudio qt4 pulseaudio qt4
]; ];

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

@ -3,7 +3,7 @@
, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , 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 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau , libvdpau
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec 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 libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libdc1394 libraw1394 libopus libebml libmatroska libvdpau

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, jackaudio, libsndfile, fftw, curl , jack2, libsndfile, fftw, curl
, libXt, qt, readline , libXt, qt, readline
, useSCEL ? false, emacs , useSCEL ? false, emacs
}: }:
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
jackaudio libsndfile fftw curl libXt qt readline ] jack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs; ++ 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 , libsndfile, pkgconfig, python
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
]; ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "python waf configure --prefix=$out";

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

@ -1,5 +1,5 @@
x@{builderDefsPackage 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 , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
, ...}: , ...}:
builderDefsPackage 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! # 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 , nonNegative, transformers
}: }:
@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
buildDepends = [ buildDepends = [
enumset eventList explicitException midi nonNegative transformers enumset eventList explicitException midi nonNegative transformers
]; ];
pkgconfigDepends = [ jackaudio ]; pkgconfigDepends = [ jack2 ];
meta = { meta = {
homepage = "http://www.haskell.org/haskellwiki/JACK"; homepage = "http://www.haskell.org/haskellwiki/JACK";
description = "Bindings for the JACK Audio Connection Kit"; description = "Bindings for the JACK Audio Connection Kit";

4
pkgs/development/libraries/mlt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate { stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate
, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2 SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig qt sox makeWrapper movit pkgconfig qt sox
]; ];

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

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

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

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

30
pkgs/misc/jackaudio/jack1.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid
, firewireSupport ? false, ffado ? null }:
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jack1-${version}";
version = "0.124.1";
src = fetchurl {
url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz";
sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb";
};
preBuild = "echo ok";
configureFlags = ''
${if firewireSupport then "--enable-firewire" else ""}
'';
buildInputs =
[ pkgconfig alsaLib db libuuid
] ++ (stdenv.lib.optional firewireSupport ffado);
meta = {
description = "JACK audio connection kit";
homepage = "http://jackaudio.org";
license = "GPL";
};
}

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 { stdenv.mkDerivation rec {
name = "alsa-plugins-1.0.28"; name = "alsa-plugins-1.0.28";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig alsaLib libogg ] [ pkgconfig alsaLib libogg ]
++ stdenv.lib.optional (pulseaudio != null) pulseaudio ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
++ stdenv.lib.optional (jackaudio != null) jackaudio; ++ stdenv.lib.optional (jack2 != null) jack2;
meta = { meta = {
description = "Various plugins for ALSA"; 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 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
, bluez, sbc, udev, libcap, json_c , bluez, sbc, udev, libcap, json_c
, jackaudioSupport ? false, jackaudio ? null , jackaudioSupport ? false, jack2 ? null
, x11Support ? false, xlibs , x11Support ? false, xlibs
, useSystemd ? false, systemd ? null }: , useSystemd ? false, systemd ? null }:
assert jackaudioSupport -> jackaudio != null; assert jackaudioSupport -> jack2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pulseaudio-5.0"; name = "pulseaudio-5.0";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
speex json_c ] 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.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
++ stdenv.lib.optional useSystemd systemd ++ stdenv.lib.optional useSystemd systemd
++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ]; ++ 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 let inherit (composableDerivation) edf; in
@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
}; };
jack = { jack = {
audioModes = "jack"; audioModes = "jack";
buildInputs = [jackaudio]; buildInputs = [jack2];
NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"]; NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
}; };
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};

7
pkgs/top-level/all-packages.nix
View File

@ -7062,7 +7062,7 @@ let
alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaLib = callPackage ../os-specific/linux/alsa-lib { };
alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
jackaudio = null; jack2 = null;
}; };
alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
@ -11076,7 +11076,10 @@ let
hplipWithPlugin = hplip.override { withPlugin = true; }; hplipWithPlugin = hplip.override { withPlugin = true; };
jackaudio = callPackage ../misc/jackaudio { }; # using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
jack2 = callPackage ../misc/jackaudio { };
keynav = callPackage ../tools/X11/keynav { }; 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 sed -i "/use_setuptools/d" setup.py
''; '';
buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; buildInputs = [ pkgs.alsaLib pkgs.jack2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Python wrapper for the RtMidi C++ library written with Cython"; description = "A Python wrapper for the RtMidi C++ library written with Cython";