From bce9de06bd1a1be5bc88816841135bb056adc4bc Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 8 Apr 2012 00:00:03 +0000 Subject: [PATCH] Adding firewire support svn path=/nixpkgs/trunk/; revision=33665 --- pkgs/misc/jackaudio/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 2470915ea8e..7e6d0da9031 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, python, dbus, pythonDBus, expat, makeWrapper }: +{ stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate +, libsndfile, makeWrapper, pkgconfig, python, pythonDBus +, firewireSupport ? false, ffado ? null }: + +assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { name = "jackdbus-${version}"; @@ -9,9 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac"; }; - buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ]; + buildInputs = + [ alsaLib dbus expat libsamplerate libsndfile makeWrapper + pkgconfig python pythonDBus + ] ++ (stdenv.lib.optional firewireSupport ffado); - configurePhase = "cd jack-1.9.8 && python waf configure --prefix=$out --dbus --alsa"; + configurePhase = '' + cd jack-1.9.8 + python waf configure --prefix=$out --dbus --alsa \ + ${if firewireSupport then "--firewire" else ""} + ''; buildPhase = "python waf build";