3 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 786ed21deccb1..c7ef57357500d 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libX11, mesa, freeglut
-, jackaudio, libcdio, libsndfile, libsamplerate
+, jack2, libcdio, libsndfile, libsamplerate
 , SDL, SDL_net, zlib
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ];
+  [ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
   
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 580d658385153..4f9f071094bc0 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 0000000000000..d424452ecd580
--- /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";
+  };
+}