From 729725501922fad5955b86bf0e06a2f6fee659f6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 27 Jun 2015 00:17:52 -0700 Subject: [PATCH] Convert all jack references to libjack2 --- pkgs/applications/audio/QmidiNet/default.nix | 4 ++-- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- pkgs/applications/audio/ardour/ardour3.nix | 4 ++-- pkgs/applications/audio/ardour/default.nix | 4 ++-- pkgs/applications/audio/artyFX/default.nix | 4 ++-- pkgs/applications/audio/bitmeter/default.nix | 4 ++-- pkgs/applications/audio/bristol/default.nix | 4 ++-- pkgs/applications/audio/calf/default.nix | 4 ++-- pkgs/applications/audio/dirt/default.nix | 4 ++-- pkgs/applications/audio/distrho/default.nix | 4 ++-- pkgs/applications/audio/drumgizmo/default.nix | 4 ++-- pkgs/applications/audio/drumkv1/default.nix | 6 +++--- pkgs/applications/audio/faust/faust2jack.nix | 4 ++-- pkgs/applications/audio/faust/faust2jaqt.nix | 4 ++-- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- pkgs/applications/audio/fmit/default.nix | 4 ++-- pkgs/applications/audio/foo-yc20/default.nix | 4 ++-- pkgs/applications/audio/freewheeling/default.nix | 4 ++-- pkgs/applications/audio/guitarix/default.nix | 4 ++-- pkgs/applications/audio/hydrogen/default.nix | 4 ++-- pkgs/applications/audio/ingen/default.nix | 4 ++-- pkgs/applications/audio/jaaa/default.nix | 4 ++-- pkgs/applications/audio/jack-capture/default.nix | 4 ++-- .../audio/jack-oscrolloscope/default.nix | 4 ++-- pkgs/applications/audio/jack-rack/default.nix | 4 ++-- pkgs/applications/audio/jackmeter/default.nix | 4 ++-- pkgs/applications/audio/jalv/default.nix | 4 ++-- pkgs/applications/audio/lash/default.nix | 4 ++-- pkgs/applications/audio/linuxsampler/default.nix | 4 ++-- pkgs/applications/audio/lmms/default.nix | 4 ++-- pkgs/applications/audio/mhwaveedit/default.nix | 4 ++-- pkgs/applications/audio/milkytracker/default.nix | 4 ++-- pkgs/applications/audio/moc/default.nix | 4 ++-- pkgs/applications/audio/musescore/default.nix | 4 ++-- pkgs/applications/audio/petrifoo/default.nix | 4 ++-- pkgs/applications/audio/projectm/default.nix | 4 ++-- pkgs/applications/audio/puredata/default.nix | 4 ++-- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- pkgs/applications/audio/qsynth/default.nix | 4 ++-- pkgs/applications/audio/qtractor/default.nix | 4 ++-- pkgs/applications/audio/rakarrack/default.nix | 4 ++-- pkgs/applications/audio/samplv1/default.nix | 6 +++--- pkgs/applications/audio/seq24/default.nix | 4 ++-- pkgs/applications/audio/setbfree/default.nix | 4 ++-- pkgs/applications/audio/sonic-visualiser/default.nix | 4 ++-- pkgs/applications/audio/sooperlooper/default.nix | 4 ++-- pkgs/applications/audio/synthv1/default.nix | 6 +++--- pkgs/applications/audio/tetraproc/default.nix | 6 +++--- pkgs/applications/audio/vmpk/default.nix | 4 ++-- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- pkgs/applications/audio/xsynth-dssi/default.nix | 4 ++-- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- pkgs/applications/audio/zynaddsubfx/default.nix | 4 ++-- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/applications/video/mplayer/default.nix | 6 +++--- pkgs/applications/video/mpv/default.nix | 6 +++--- .../video/simplescreenrecorder/default.nix | 4 ++-- pkgs/applications/video/vlc/default.nix | 4 ++-- .../development/haskell-modules/hackage-packages.nix | 12 ++++++------ .../interpreters/supercollider/default.nix | 4 ++-- pkgs/development/libraries/aubio/default.nix | 4 ++-- pkgs/development/libraries/dssi/default.nix | 2 +- pkgs/development/libraries/ffmpeg-full/default.nix | 6 +++--- pkgs/development/libraries/mlt/default.nix | 4 ++-- pkgs/development/libraries/mlt/qt5.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/servers/mpd/default.nix | 4 ++-- pkgs/tools/audio/darkice/default.nix | 4 ++-- pkgs/tools/audio/liquidsoap/full.nix | 4 ++-- pkgs/tools/misc/timidity/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 73 files changed, 156 insertions(+), 156 deletions(-) diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix index 4ab871c22a0..4e89f125dd9 100644 --- a/pkgs/applications/audio/QmidiNet/default.nix +++ b/pkgs/applications/audio/QmidiNet/default.nix @@ -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"; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 218a0f8c6d9..7b0aad152ab 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -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"; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index aca04f299c2..a501fd95427 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -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 diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 280cf6e8042..5327b6b77d7 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -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 diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index e60381710c3..345d8f6ff0a 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -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/; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 2084ab481fa..0ca3d99ddc6 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -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/; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index d45ab818273..db1f7895f4b 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 0f6ebfcedb5..5f6538ec4bc 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 74adf4533fa..4da15a4b8e3 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -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 ''; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index e6d5971b6fd..1e52e842330 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 2daafda554e..92ea6ee2fae 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index b3a496c26a1..6d585905766 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -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"; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index bec523ad021..9dfb7f875c5 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,6 +1,6 @@ { faust , gtk -, jack2 +, jack2Full , opencv }: @@ -16,7 +16,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk - jack2 + jack2Full opencv ]; diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 3590bc6860d..c0911b31538 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,5 +1,5 @@ { faust -, jack2 +, jack2Full , opencv , qt4 }: @@ -14,7 +14,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - jack2 + jack2Full opencv qt4 ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 339cccfca70..bd35b78fbc0 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -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"; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index a8acfbffb05..712b3df9f25 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -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; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index d0de8c9f9a7..025ca594dff 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -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)"; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 0e7f8ad9957..63917cac6c0 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -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"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 9c1859cacf4..c3e0fc79e21 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 434f683bd5c..21767e3079f 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -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; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 40ba278f7a0..ab8f7af1bd5 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0b8f8863d6c..0427283d54d 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -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 = [ diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 2e6f6b0dd82..ef6d13e5696 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -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"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 7b4d12a5b87..5f796a29035 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -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 diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 8ac47c570df..e4a48230e23 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -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''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 74d98184d9d..c709483a3b2 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -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"; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index bf01fe1a935..5e99e60c818 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -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"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index e42babf13ef..8d1b561cb87 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -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 = '' diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 2c4b26543eb..4dad6e58fee 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 830d42eb91b..783b506c4d7 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 0234a1d3fe5..d0259ada3cf 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index d5d7ea7be76..8bc0aebba5a 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -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"; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index a87e74dc87c..4cb7668a43f 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -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; { diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index bfbfa577531..7f34d5df550 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 197a0aa1bbe..ffd920427ac 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index fcfde86f7ee..764ee629dbf 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -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 ; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9abca0cb014..8fddcccd51c 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -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 diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 9b87dd53bf6..c200e39887a 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -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"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index a8ff526fad9..77c0ba9b2d4 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -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"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index d3d3a71febc..418efa23b20 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -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 diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 257a9967a5b..b746cccd113 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -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; { diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 15bb1e0a17d..fd3f7791c1a 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -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"; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 10376e02f43..63db865eba5 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -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"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 5a5d500a0e7..2a534047ae3 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 70162b9d185..e0aa6e00a46 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -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 diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index b40e2187175..372339474a5 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 7b00e8ac060..4a126f8774f 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -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"; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 309a400c555..a107dd9794b 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -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; { diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 9a75fa5f383..5db7fe5afbc 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -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 ]; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index aabb6308c14..5603bc2fefc 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -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" ]; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 85e7235400b..c4ed20defd6 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -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 = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 0132d4a4c4c..9aafae7a5f4 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -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 ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 8d383ca39d6..1ac7921119a 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -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 diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 3a89b406742..ec8971d319f 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -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; { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 5e746716119..b717f3044bc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 57f8289a1f9..a317e1d4fe5 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -17,7 +17,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null -, jackaudioSupport ? false, jack2 ? null +, jackaudioSupport ? false, libjack2 ? null , pulseSupport ? false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -44,7 +44,7 @@ assert lameSupport -> lame != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> libjack2 != null; assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ++ optional dvdnavSupport libdvdnav ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport libjack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 ++ optional pulseSupport libpulseaudio diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 03cb5154f85..1be0f5b9e0a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -12,7 +12,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, jack2 ? null +, jackaudioSupport ? true, libjack2 ? null , pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null # For screenshots @@ -39,7 +39,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jack2 != null; +assert jackaudioSupport -> libjack2 != null; assert pulseSupport -> libpulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { ++ optional dvdreadSupport libdvdread ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jack2 + ++ optional jackaudioSupport libjack2 ++ optional pulseSupport libpulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 453829bc580..8560b83d5fa 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext +{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext , libXfixes, mesa, pkgconfig, libpulseaudio, qt4 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig + alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig libpulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index adf5aed3f55..ae7f71e607e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -3,7 +3,7 @@ , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image +, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libdc1394 libraw1394 libopus libebml libmatroska libvdpau ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) - ++ optional jackSupport jack2; + ++ optional jackSupport libjack2; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cbc01eb3f8d..2bf10c605af 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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 }: diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index a8c967b5967..a20d5b1dfd1 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -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; } diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 7a5351da10e..472a2ad9807 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -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"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index ae276c6aa0a..a544baf7d6d 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -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 diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index aee67f5cd77..7d108ba81ef 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -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 diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 7cfbc8dfb87..2bb709612b4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/mlt/qt5.nix b/pkgs/development/libraries/mlt/qt5.nix index 4fcd029971c..d3d8f6c6b86 100644 --- a/pkgs/development/libraries/mlt/qt5.nix +++ b/pkgs/development/libraries/mlt/qt5.nix @@ -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 ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 6fe92e4cfb6..e87ac98c838 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -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 diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 90dd2040e5d..c7380b02306 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -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 diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 8a9393cd1f6..edc8fe2dffc 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -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}" diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 1da9a6f465c..859fe4bb183 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -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 diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 664647514aa..5655e27dc2e 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -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]; };}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 591a1adc400..df4cf0c8cec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14522,10 +14522,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 910d763bac3..a299f931278 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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";