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

Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
This commit is contained in:
Bjørn Forsman
2014-07-22 22:06:44 +02:00
parent cbd8f7093b
commit f6f2f38a6e
56 changed files with 121 additions and 115 deletions

View File

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

View File

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

View File

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