summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/jackaudio
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-07-28 12:07:44 +0200
committerPeter Simons <simons@cryp.to>2014-07-28 20:32:52 +0200
commitbdb77826d98544ab37741f740dd3516023924b27 (patch)
tree7b65a3782285d5e65ebc4306d1e1261aaacef03b /pkgs/misc/jackaudio
parent7325894d72e573a3eb6dea89dcf1dd82a39cb578 (diff)
Remove obsolete jackaudio version 1.
Diffstat (limited to 'pkgs/misc/jackaudio')
-rw-r--r--pkgs/misc/jackaudio/default.nix2
-rw-r--r--pkgs/misc/jackaudio/jack1.nix30
2 files changed, 1 insertions, 31 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 4f9f071094bc..580d65838515 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 = "jack2-${version}";
+ name = "jackaudio-${version}";
version = "1.9.9.5";
src = fetchurl {
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
deleted file mode 100644
index d424452ecd58..000000000000
--- a/pkgs/misc/jackaudio/jack1.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ 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";
- };
-}