summary refs log tree commit diff
path: root/pkgs/applications/audio/moc
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/applications/audio/moc
parent10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff)
downloadnixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.gz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.bz2
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.lz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.xz
nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.zst
nixpkgs-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/applications/audio/moc')
-rw-r--r--pkgs/applications/audio/moc/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index e822e405741..e5264f5c3d2 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
-, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag
+, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
 , libtool
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
-    mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool
+    mpc libsndfile jack2 db libmodplug timidity libid3tag libtool
   ];
 
   meta = {