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/os-specific/linux/alsa-plugins/default.nix | |
| parent | 10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff) | |
| download | nixpkgs-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/os-specific/linux/alsa-plugins/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-plugins/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 802658ea288..1a602858b7a 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }: stdenv.mkDerivation rec { name = "alsa-plugins-1.0.28"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig alsaLib libogg ] ++ stdenv.lib.optional (pulseaudio != null) pulseaudio - ++ stdenv.lib.optional (jackaudio != null) jackaudio; + ++ stdenv.lib.optional (jack2 != null) jack2; - meta = { + meta = { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; license = stdenv.lib.licenses.lgpl21; |