Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-06-27 00:18:18 -07:00
commit 12102562f7
73 changed files with 156 additions and 156 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, alsaLib, jack2 }:
{ stdenv, fetchurl, qt4, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
version = "0.2.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
};
buildInputs = [ qt4 alsaLib jack2 ];
buildInputs = [ qt4 alsaLib libjack2 ];
meta = with stdenv.lib; {
description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, jack2
{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
, python, pythonDBus }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
};
buildInputs = [ makeWrapper pkgconfig alsaLib dbus jack2 python pythonDBus ];
buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python pythonDBus ];
configurePhase = "python waf configure --prefix=$out";

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cairomm, cmake, jack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
stdenv.mkDerivation rec {
name = "artyFX-git-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "2e3f6ab6f829c0ec177e85f4e419286616cf35fb7303445caa09d3438cac27d5";
};
buildInputs = [ cairomm cmake jack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jack2, gtk2, pkgconfig }:
{ stdenv, fetchurl, libjack2, gtk2, pkgconfig }:
stdenv.mkDerivation rec {
name = "bitmeter-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
};
buildInputs = [ jack2 gtk2 pkgconfig ];
buildInputs = [ libjack2 gtk2 pkgconfig ];
meta = with stdenv.lib; {
homepage = http://devel.tlrmx.org/audio/bitmeter/;

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation rec {
name = "dirt-2015-04-28";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
rev = "cfc5e85318defda7462192b5159103c823ce61f7";
sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
};
buildInputs = [ libsndfile libsamplerate liblo jack2 ];
buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = ''
sed -i "s|./samples|$out/share/dirt/samples|" file.h
'';

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, expat, glib, jack2, libX11, libpng
{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-lv2" ];
buildInputs = [
alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf
alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
libsndfile lv2 pkgconfig
];

View File

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

View File

@ -1,6 +1,6 @@
{ faust
, gtk
, jack2
, jack2Full
, opencv
}:
@ -16,7 +16,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [
gtk
jack2
jack2Full
opencv
];

View File

@ -1,5 +1,5 @@
{ faust
, jack2
, jack2Full
, opencv
, qt4
}:
@ -14,7 +14,7 @@ faust.wrapWithBuildEnv {
];
propagatedBuildInputs = [
jack2
jack2Full
opencv
qt4
];

View File

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

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, alsaLib, cmake, fftw
, freeglut, jack2, libXmu, qt4 }:
, freeglut, libjack2, libXmu, qt4 }:
let version = "1.0.0"; in
stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "gillesdegottex";
};
buildInputs = [ alsaLib fftw freeglut jack2 libXmu qt4 ];
buildInputs = [ alsaLib fftw freeglut libjack2 libXmu qt4 ];
nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jack2, gtk2, lv2, faust, pkgconfig }:
{ stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkgconfig }:
stdenv.mkDerivation rec {
version = "git-2015-05-21";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
};
buildInputs = [ jack2 gtk2 lv2 faust pkgconfig ];
buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ];
makeFlags = "PREFIX=$(out)";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
, libsndfile, libogg
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [
pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
];
preConfigure = "autoreconf -vfi";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2
, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2
, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext intltool pkgconfig python ];
buildInputs = [
avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2
avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2
ladspaH librdf libsndfile lilv lv2 serd sord sratom
zita-convolver zita-resampler
];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive
{ stdenv, fetchurl, alsaLib, boost, cmake, glib, libjack2, libarchive
, liblrdf, libsndfile, pkgconfig, qt4 }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4
alsaLib boost cmake glib libjack2 libarchive liblrdf libsndfile pkgconfig qt4
];
meta = with stdenv.lib; {

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, jack2, xlibs, zita-alsa-pcmi }:
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }:
stdenv.mkDerivation rec {
name = "jaaa-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi
alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi
];
makeFlags = [

View File

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

View File

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

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
{ stdenv, fetchurl, pkgconfig, libjack2, 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 jack2 ladspaH gtk alsaLib libxml2 librdf ];
buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2
{ stdenv, fetchurl, alsaLib, gtk, libjack2, 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 jack2 libuuid libxml2 makeWrapper
buildInputs = [ alsaLib gtk libjack2 libuuid libxml2 makeWrapper
pkgconfig readline ];
postInstall = ''

View File

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
, libjack2, 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 jack2 libgig libsndfile
alsaLib asio autoconf automake bison libjack2 libgig libsndfile
libtool lv2 pkgconfig
];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
, fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
, libpulseaudio, qt4, freetype
}:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2
libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
];

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, alsaLib, freetype, jack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, qt5 #, tesseract
}:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
alsaLib jack2 freetype lame libogg libpulseaudio libsndfile libvorbis
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools
qt5.webkit qt5.xmlpatterns #tesseract
];

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }:
{ stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }:
stdenv.mkDerivation rec {
version = "0.3.12";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "14yvnc4k3hwsjflg8b2d04bc63pdl0gyqjc7vl6rdn29nbr23zwc";
};
buildInputs = [ qt4 alsaLib jack2 dbus ];
buildInputs = [ qt4 alsaLib libjack2 dbus ];
configureFlags = "--enable-jack-version";

View File

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

View File

@ -1,4 +1,4 @@
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2
, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd
, sord, sratom, stdenv, suil }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ alsaLib autoconf automake dssi gtk jack2 ladspaH
[ alsaLib autoconf automake dssi gtk libjack2 ladspaH
ladspaPlugins liblo libmad libsamplerate libsndfile libtool
libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom
suil

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft,
{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, 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 jack2 libXft libXpm libjpeg
buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; {

View File

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

View File

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

View File

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

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, jack2, libX11, liblo
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, libpulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK, fftwFloat
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sord
pkgconfig
# optional
jack2
libjack2
# portaudio
libpulseaudio
libmad

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, liblo, libxml2, jack2, libsndfile, wxGTK, libsigcxx
{ stdenv, fetchurl, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx
,libsamplerate, rubberband, pkgconfig, ncurses
}:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
liblo libxml2 jack2 libsndfile wxGTK libsigcxx
liblo libxml2 libjack2 libsndfile wxGTK libsigcxx
libsamplerate rubberband pkgconfig ncurses
];

View File

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

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient
, libsndfile, libxcb, xlibs
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender
];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
postInstall = ''
# Make sure Jack is avalable in $PATH for tetraproc
wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin"
'';
meta = with stdenv.lib; {

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, jack2, mesa_glu, pkgconfig
{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig
, libltc, libsndfile, libsamplerate
, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
};
buildInputs = [ mesa_glu ftgl freefont_ttf jack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, libX11, mesa, liblo, jack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
{ stdenv, fetchurl, boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm";
};
buildInputs = [ boost libX11 mesa liblo jack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
patchPhase = ''
patchShebangs ./libs/generate-ttl.sh

View File

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

View File

@ -2,7 +2,7 @@
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib, fftw
, jackaudioSupport ? false, jack2
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit65
, colladaSupport ? true, opencollada
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
]
++ optional jackaudioSupport jack2
++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit65
++ optional colladaSupport opencollada;

View File

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

View File

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

View File

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

View File

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

View File

@ -77147,7 +77147,7 @@ self: {
"jack" = callPackage
({ mkDerivation, array, base, bytestring, enumset, event-list
, explicit-exception, jack2, midi, non-negative, transformers, unix
, explicit-exception, libjack2, midi, non-negative, transformers, unix
}:
mkDerivation {
pname = "jack";
@ -77159,25 +77159,25 @@ self: {
array base bytestring enumset event-list explicit-exception midi
non-negative transformers unix
];
pkgconfigDepends = [ jack2 ];
pkgconfigDepends = [ libjack2 ];
homepage = "http://www.haskell.org/haskellwiki/JACK";
description = "Bindings for the JACK Audio Connection Kit";
license = "GPL";
}) { inherit (pkgs) jack2;};
}) { inherit (pkgs) libjack2;};
"jack-bindings" = callPackage
({ mkDerivation, base, c2hs, jack2, mtl }:
({ mkDerivation, base, c2hs, libjack2, mtl }:
mkDerivation {
pname = "jack-bindings";
version = "0.1.1";
sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
buildDepends = [ base mtl ];
buildTools = [ c2hs ];
pkgconfigDepends = [ jack2 ];
pkgconfigDepends = [ libjack2 ];
description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs) jack2;};
}) { inherit (pkgs) libjack2;};
"jackminimix" = callPackage
({ mkDerivation, base, hosc }:

View File

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

View File

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

View File

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

View File

@ -67,7 +67,7 @@
, gnutls ? null
, gsm ? null # GSM de/encoder
#, ilbc ? null # iLBC de/encoder
, jack2 ? null # Jack audio (only version 2 is supported in this build)
, libjack2 ? null # Jack audio (only version 2 is supported in this build)
, ladspaH ? null # LADSPA audio filtering
, lame ? null # LAME MP3 encoder
, libass ? null # (Advanced) SubStation Alpha subtitle rendering
@ -157,7 +157,7 @@
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
* frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
* frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
* pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
*
* Not supported:
@ -397,7 +397,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib

View File

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

View File

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

View File

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

View File

@ -18,7 +18,7 @@
, mpg123Support ? true, mpg123
, aacSupport ? true, faad2
, pulseaudioSupport ? true, libpulseaudio
, jackSupport ? true, jack2
, jackSupport ? true, libjack2
, gmeSupport ? true, game-music-emu
, icuSupport ? true, icu
, clientSupport ? false, mpd_clientlib
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
++ opt aacSupport faad2
++ opt zipSupport zziplib
++ opt pulseaudioSupport libpulseaudio
++ opt jackSupport jack2
++ opt jackSupport libjack2
++ opt gmeSupport game-music-emu
++ opt icuSupport icu
++ opt clientSupport mpd_clientlib

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
{ stdenv, fetchurl, alsaLib, faac, libjack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-alsa-prefix=${alsaLib}"
"--with-faac-prefix=${faac}"
"--with-jack-prefix=${jack2}"
"--with-jack-prefix=${libjack2}"
"--with-lame-prefix=${lame}"
"--with-opus-prefix=${libopus}"
"--with-pulseaudio-prefix=${libpulseaudio}"

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, pkgconfig
, ocaml, ocamlPackages
, libao, portaudio, alsaLib, libpulseaudio, jack2
, libao, portaudio, alsaLib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, fdk_aac
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@ -27,7 +27,7 @@ stdenv.mkDerivation {
buildInputs =
[ which ocaml ocamlPackages.findlib pkgconfig
libao portaudio alsaLib libpulseaudio jack2
libao portaudio alsaLib libpulseaudio libjack2
libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus fdk_aac
faad2 flac ladspaH ffmpeg frei0r dssi

View File

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

View File

@ -14466,10 +14466,10 @@ let
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
jack2 = callPackage ../misc/jackaudio {
jack2Full = callPackage ../misc/jackaudio {
libopus = libopus.override { withCustomModes = true; };
};
libjack2 = jack2.override { prefix = "lib"; };
libjack2 = jack2Full.override { prefix = "lib"; };
keynav = callPackage ../tools/X11/keynav { };

View File

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