Author: cillian
Date: Mon May 9 20:49:51 2011
New Revision: 27205
URL: https://svn.nixos.org/websvn/nix/?rev=27205&sc=1
Log:
Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much
better for me
Added:
nixpkgs/trunk/pkgs/misc/jackaudio/jack1.nix
- copied unchanged from r27175,
nixpkgs/trunk/pkgs/misc/jackaudio/default.nix
Replaced:
nixpkgs/trunk/pkgs/misc/jackaudio/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/misc/jackaudio/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/jackaudio/default.nix Mon May 9 20:49:51
2011 (r27205)
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, alsaLib, python, dbus, pythonDBus, expat,
makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "jackdbus-${version}";
+ version = "1.9.7";
+
+ src = fetchurl {
+ url = "http://www.grame.fr/~letz/jack-1.9.7.tar.bz2";;
+ sha256 = "01gcn82bb7xnbcsd2ispbav6lwm0il4g8rs2mbaqpcrf9nnmfvq9";
+ };
+
+ buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ];
+
+ configurePhase = "python waf configure --prefix=$out --dbus --alsa";
+
+ buildPhase = "python waf";
+
+ installPhase = ''
+ python waf install
+ wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
+ '';
+
+ meta = with stdenv.lib; {
+ description = "JACK audio connection kit, version 2 with jackdbus";
+ homepage = "http://jackaudio.org";;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.goibhniu ];
+ };
+}
Copied: nixpkgs/trunk/pkgs/misc/jackaudio/jack1.nix (from r27175,
nixpkgs/trunk/pkgs/misc/jackaudio/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/jackaudio/jack1.nix Mon May 9 20:49:51 2011
(r27205, copy of r27175, nixpkgs/trunk/pkgs/misc/jackaudio/default.nix)
@@ -0,0 +1,48 @@
+# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack
+# still much to test but it compiles now
+
+{ composableDerivation, fetchurl, pkgconfig, alsaLib }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+ name = "jack-0.120.1";
+
+ src = fetchurl {
+ url =
"http://jackaudio.org/downloads/jack-audio-connection-kit-0.120.1.tar.gz";;
+ sha256 = "02h8536c67059gq2vsl323kvy9jak9dp0syi1h58awlkbgzlg80d";
+ };
+
+ buildInputs = [ pkgconfig ];
+
+ flags =
+ # FIXME: tidy up
+ edf { name = "posix-shm"; } #use POSIX shm API
+ // edf { name = "timestamps"; } # allow clients to
use the JACK timestamp API
+ // edf { name = "capabilities"; } #use libcap to gain
realtime scheduling priviledges
+ // edf { name = "oldtrans"; } #remove old transport
interfaces
+ // edf { name = "stripped-jackd"; } #strip jack before
computing its md5 sum
+ // edf { name = "portaudio"; } #ignore PortAudio driver
+ // edf { name = "coreaudio"; } #ignore CoreAudio driver
+ // edf { name = "oss"; } #ignore OSS driver
+ // edf { name = "freebob"; } #ignore FreeBob driver
+ // edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; };
+
+ cfg = {
+ posix_shmSupport = true;
+ timestampsSupport = true;
+ alsaSupport = true;
+ };
+
+ # make sure the jackaudio is found by symlinking lib64 to lib
+ postInstall = ''
+ ensureDir $out/lib
+ ln -s $out/lib{64,}/pkgconfig
+ '';
+
+ meta = {
+ description = "JACK audio connection kit";
+ homepage = "http://jackaudio.org";;
+ license = "GPL";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 9 20:27:06
2011 (r27204)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 9 20:49:51
2011 (r27205)
@@ -7788,6 +7788,8 @@
};
# using the new configuration style proposal which is unstable
+ jack1d = callPackage ../misc/jackaudio/jack1.nix { };
+
jackaudio = callPackage ../misc/jackaudio { };
keynav = callPackage ../tools/X11/keynav { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
