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

Merge branch 'master.upstream' into staging.upstream

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

4
pkgs/applications/audio/ardour/ardour3.nix
View File

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

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

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

4
pkgs/applications/audio/artyFX/default.nix
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 { stdenv.mkDerivation rec {
name = "artyFX-git-${version}"; name = "artyFX-git-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "2e3f6ab6f829c0ec177e85f4e419286616cf35fb7303445caa09d3438cac27d5"; 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; { meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/; homepage = http://openavproductions.com/artyfx/;

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

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

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

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

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

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

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

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

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

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

4
pkgs/applications/audio/drumgizmo/default.nix
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 , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-lv2" ]; configureFlags = [ "--enable-lv2" ];
buildInputs = [ buildInputs = [
alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
libsndfile lv2 pkgconfig libsndfile lv2 pkgconfig
]; ];

6
pkgs/applications/audio/drumkv1/default.nix
View File

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

4
pkgs/applications/audio/faust/faust2jack.nix
View File

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

4
pkgs/applications/audio/faust/faust2jaqt.nix
View File

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

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

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

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

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

4
pkgs/applications/audio/foo-yc20/default.nix
View File

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

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

@ -1,5 +1,5 @@
{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype { 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 , libsndfile, libogg
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf 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"; preConfigure = "autoreconf -vfi";

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python { 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 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, zita-convolver, zita-resampler , zita-convolver, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions , optimizationSupport ? false # Enable support for native CPU extensions
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext intltool pkgconfig python ]; nativeBuildInputs = [ gettext intltool pkgconfig python ];
buildInputs = [ 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 ladspaH librdf libsndfile lilv lv2 serd sord sratom
zita-convolver zita-resampler zita-convolver zita-resampler
]; ];

4
pkgs/applications/audio/hydrogen/default.nix
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 }: , liblrdf, libsndfile, pkgconfig, qt4 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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; { meta = with stdenv.lib; {

4
pkgs/applications/audio/ingen/default.nix
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 , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
, suil , suil
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 python raul serd sord-svn sratom suil
]; ];

4
pkgs/applications/audio/jaaa/default.nix
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 { stdenv.mkDerivation rec {
name = "jaaa-${version}"; name = "jaaa-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi
]; ];
makeFlags = [ makeFlags = [

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
pkgs/applications/audio/mhwaveedit/default.nix
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 }: , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile
pkgconfig libpulseaudio pkgconfig libpulseaudio
]; ];

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

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

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

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

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

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

4
pkgs/applications/audio/petrifoo/default.nix
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 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }: , pkgconfig }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig libsamplerate libsndfile libtool libxml2 pkgconfig
]; ];

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

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

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

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

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

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

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

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

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

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

4
pkgs/applications/audio/rakarrack/default.nix
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 }: libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ]; patches = [ ./fltk-path.patch ];
buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ]; libpng libsamplerate libsndfile zlib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/applications/audio/samplv1/default.nix
View File

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

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

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

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

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

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

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

4
pkgs/applications/audio/sooperlooper/default.nix
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 ,libsamplerate, rubberband, pkgconfig, ncurses
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
liblo libxml2 jack2 libsndfile wxGTK libsigcxx liblo libxml2 libjack2 libsndfile wxGTK libsigcxx
libsamplerate rubberband pkgconfig ncurses libsamplerate rubberband pkgconfig ncurses
]; ];

6
pkgs/applications/audio/synthv1/default.nix
View File

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

6
pkgs/applications/audio/tetraproc/default.nix
View File

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

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

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

4
pkgs/applications/audio/x42-plugins/default.nix
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 , libltc, libsndfile, libsamplerate
, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: , lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk"; 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" ]; makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];

4
pkgs/applications/audio/xsynth-dssi/default.nix
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 }: ladspaH, ladspaPlugins, liblo, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
}; };
buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
ladspaPlugins liblo pkgconfig ]; ladspaPlugins liblo pkgconfig ];
installPhase = '' installPhase = ''

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

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

4
pkgs/applications/audio/zam-plugins/default.nix
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 { stdenv.mkDerivation rec {
name = "zam-plugins-${version}"; name = "zam-plugins-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm"; 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 = '' patchPhase = ''
patchShebangs ./libs/generate-ttl.sh patchShebangs ./libs/generate-ttl.sh

4
pkgs/applications/audio/zynaddsubfx/default.nix
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 , minixml, pkgconfig, zlib
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53"; sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53";
}; };
buildInputs = [ alsaLib jack2 fftw fltk13 libjpeg minixml zlib ]; buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

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

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

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

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

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

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

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

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

@ -3,7 +3,7 @@
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , 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 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau , libvdpau
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libdc1394 libraw1394 libopus libebml libmatroska libvdpau
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ (if withQt5 then with qt5; [ base ] else [qt4])
++ optional jackSupport jack2; ++ optional jackSupport libjack2;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

12
pkgs/development/haskell-modules/hackage-packages.nix
View File

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

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

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

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

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

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

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

6
pkgs/development/libraries/ffmpeg-full/default.nix
View File

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

4
pkgs/development/libraries/mlt/default.nix
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 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2 SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
makeWrapper movit pkgconfig qt sox makeWrapper movit pkgconfig qt sox
]; ];

4
pkgs/development/libraries/mlt/qt5.nix
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 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 makeWrapper movit pkgconfig qt5.base qt5.svg sox
]; ];

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

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

4
pkgs/servers/mpd/default.nix
View File

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

4
pkgs/tools/audio/darkice/default.nix
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; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-alsa-prefix=${alsaLib}" "--with-alsa-prefix=${alsaLib}"
"--with-faac-prefix=${faac}" "--with-faac-prefix=${faac}"
"--with-jack-prefix=${jack2}" "--with-jack-prefix=${libjack2}"
"--with-lame-prefix=${lame}" "--with-lame-prefix=${lame}"
"--with-opus-prefix=${libopus}" "--with-opus-prefix=${libopus}"
"--with-pulseaudio-prefix=${libpulseaudio}" "--with-pulseaudio-prefix=${libpulseaudio}"

4
pkgs/tools/audio/liquidsoap/full.nix
View File

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

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

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

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

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

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

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