diff options
author | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-05-09 20:49:51 +0000 |
---|---|---|
committer | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-05-09 20:49:51 +0000 |
commit | 3fb9e2214bbf85bfcf2bd639af054596d2baec75 (patch) | |
tree | 3d3cc85ea6555a7958f3d71d604b9f63fc0e78c0 /pkgs/misc/jackaudio/default.nix | |
parent | e56d84e5418f8adbc4ab6f2ad6a95bf50bd5afc8 (diff) | |
download | nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar.gz nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar.bz2 nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar.lz nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar.xz nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.tar.zst nixlib-3fb9e2214bbf85bfcf2bd639af054596d2baec75.zip |
Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me
svn path=/nixpkgs/trunk/; revision=27205
Diffstat (limited to 'pkgs/misc/jackaudio/default.nix')
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 60 |
1 files changed, 21 insertions, 39 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 88bc4dff5404..522da20f73c5 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,48 +1,30 @@ -# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack -# still much to test but it compiles now +{ stdenv, fetchurl, pkgconfig, alsaLib, python, dbus, pythonDBus, expat, makeWrapper }: -{ composableDerivation, fetchurl, pkgconfig, alsaLib }: +stdenv.mkDerivation rec { + name = "jackdbus-${version}"; + version = "1.9.7"; -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"; + url = "http://www.grame.fr/~letz/jack-1.9.7.tar.bz2"; + sha256 = "01gcn82bb7xnbcsd2ispbav6lwm0il4g8rs2mbaqpcrf9nnmfvq9"; }; - - 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 + 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 = { - description = "JACK audio connection kit"; + + meta = with stdenv.lib; { + description = "JACK audio connection kit, version 2 with jackdbus"; homepage = "http://jackaudio.org"; - license = "GPL"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; }; } |