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/misc/jackaudio | |
| 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/misc/jackaudio')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/jack1.nix | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 580d6583851..4f9f071094b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { - name = "jackaudio-${version}"; + name = "jack2-${version}"; version = "1.9.9.5"; src = fetchurl { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix new file mode 100644 index 00000000000..d424452ecd5 --- /dev/null +++ b/pkgs/misc/jackaudio/jack1.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid +, firewireSupport ? false, ffado ? null }: + +assert firewireSupport -> ffado != null; + +stdenv.mkDerivation rec { + name = "jack1-${version}"; + version = "0.124.1"; + + src = fetchurl { + url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; + }; + + preBuild = "echo ok"; + + configureFlags = '' + ${if firewireSupport then "--enable-firewire" else ""} + ''; + + buildInputs = + [ pkgconfig alsaLib db libuuid + ] ++ (stdenv.lib.optional firewireSupport ffado); + + meta = { + description = "JACK audio connection kit"; + homepage = "http://jackaudio.org"; + license = "GPL"; + }; +} |