diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-31 12:47:17 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-31 12:52:29 +0200 |
| commit | 62d0a320b32539a6b9efa868183f27f215aa2917 (patch) | |
| tree | 45b9d3fa78640bb0a3591f1a9efb12970690836b /pkgs/development/interpreters/supercollider | |
| parent | 10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff) | |
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/development/interpreters/supercollider')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 59fb9268372c..a8c967b59678 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; } |