summary refs log tree commit diff
path: root/pkgs/tools/misc/timidity
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/tools/misc/timidity
parentcbd8f7093bc398103be51c07cca74ea832598dc3 (diff)
downloadnixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar
nixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.gz
nixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.bz2
nixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.lz
nixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.xz
nixlib-f6f2f38a6e782b981bca42e4c98e0a918625a711.tar.zst
nixlib-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/tools/misc/timidity')
-rw-r--r--pkgs/tools/misc/timidity/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 89ff6f4677fc..afe75c572c02 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
+{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }:
 
 let inherit (composableDerivation) edf; in
 
@@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
     };
     jack = {
       audioModes = "jack";
-      buildInputs = [jackaudio];
-      NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"];
+      buildInputs = [jack2];
+      NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
     };
   } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};