Author: cillian
Date: Sun Apr 8 00:00:03 2012
New Revision: 33665
URL: https://nixos.org/websvn/nix/?rev=33665&sc=1
Log:
Adding firewire support
Modified:
nixpkgs/trunk/pkgs/misc/jackaudio/default.nix
Modified: nixpkgs/trunk/pkgs/misc/jackaudio/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/jackaudio/default.nix Sat Apr 7 23:57:30
2012 (r33664)
+++ nixpkgs/trunk/pkgs/misc/jackaudio/default.nix Sun Apr 8 00:00:03
2012 (r33665)
@@ -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 @@
sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac";
};
- buildInputs = [ pkgconfig alsaLib python dbus pythonDBus expat makeWrapper ];
-
- configurePhase = "cd jack-1.9.8 && python waf configure --prefix=$out --dbus
--alsa";
+ 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 \
+ ${if firewireSupport then "--firewire" else ""}
+ '';
buildPhase = "python waf build";
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
