diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-22 22:06:44 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-23 20:22:14 +0200 |
commit | f6f2f38a6e782b981bca42e4c98e0a918625a711 (patch) | |
tree | ad89920ea0ce97979fca673bb6a895ed7634ec01 /pkgs/development | |
parent | cbd8f7093bc398103be51c07cca74ea832598dc3 (diff) | |
download | nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.gz nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.bz2 nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.lz nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.xz nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.zst nixpkgs-f6f2f38a6e782b981bca42e4c98e0a918625a711.zip |
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
Diffstat (limited to 'pkgs/development')
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 97808f6faf1..a8c967b5967 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, jackaudio, libsndfile, fftw, curl +, jack2, libsndfile, fftw, curl , libXt, qt, readline , useSCEL ? false, emacs }: @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - jackaudio libsndfile fftw curl libXt qt readline ] + jack2 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 53ff6572052..7a5351da10e 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -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"; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 951278b4433..ae276c6aa0a 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix index acb4b0b7e57..2e6b6ee1aa3 100644 --- a/pkgs/development/libraries/haskell/jack/default.nix +++ b/pkgs/development/libraries/haskell/jack/default.nix @@ -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"; |