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-31 12:47:17 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-07-31 12:52:29 +0200
commit62d0a320b32539a6b9efa868183f27f215aa2917 (patch)
tree45b9d3fa78640bb0a3591f1a9efb12970690836b /pkgs/tools/misc/timidity
parent10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff)
downloadnixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar.gz
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar.bz2
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar.lz
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar.xz
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.tar.zst
nixlib-62d0a320b32539a6b9efa868183f27f215aa2917.zip
Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d98544ab37741f740dd3516023924b27.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

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]; };};