summary refs log tree commit diff
path: root/pkgs/applications/audio/ardour
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-07-22 22:06:44 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-23 20:22:14 +0200
commitf6f2f38a6e782b981bca42e4c98e0a918625a711 (patch)
treead89920ea0ce97979fca673bb6a895ed7634ec01 /pkgs/applications/audio/ardour
parentcbd8f7093bc398103be51c07cca74ea832598dc3 (diff)
downloadnixpkgs-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/applications/audio/ardour')
-rw-r--r--pkgs/applications/audio/ardour/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 88bc7399c65..afc2e49fc8a 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, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = 
     [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
+      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
       makeWrapper pango perl pkgconfig python serd sord sratom suil