public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding extra requirements, fixing some of the ffado utilities

Browse Source 
svn path=/nixpkgs/trunk/; revision=33664
This commit is contained in:
Cillian de Roiste 2012-04-07 23:57:30 +00:00
parent 7b00953c70
commit 285af645e6
2 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/os-specific/linux/ffado/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchsvn, dbus_glib, dbus_libs, expat, glibmm, jackaudio { stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig
, libconfig, libiec61883, libraw1394, libxmlxx, pkgconfig, pyqt4, python , libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
, pythonDBus, qt4, scons }: , pyqt4, python, pythonDBus, qt4, scons }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libffado-svn"; name = "libffado-svn-2117";
src = fetchsvn { src = fetchsvn {
url = "http://subversion.ffado.org/ffado/trunk/libffado"; url = "http://subversion.ffado.org/ffado/trunk/libffado";
@ -12,18 +12,31 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ dbus_glib dbus_libs expat glibmm jackaudio libconfig libiec61883 [ dbus dbus_cplusplus expat glibmm libavc1394 libconfig
libraw1394 libxmlxx pkgconfig pyqt4 python pythonDBus qt4 scons libiec61883 libraw1394 libxmlxx makeWrapper pkgconfig pyqt4
python pythonDBus qt4 scons
]; ];
buildPhase = "scons"; patches = [ ./enable-mixer-and-dbus.patch ];
preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages";
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX";
installPhase = '' installPhase = ''
scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado install scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
PYPKGDIR=$out/$PYLIBSUFFIX install
PYDIR=$out/$PYLIBSUFFIX
wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
$PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \
$PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.ffado.org; homepage = http://www.ffado.org;
description = "Firewire audio drivers"; description = "FireWire audio drivers";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ]; maintainers = [ maintainers.goibhniu ];
}; };

25
pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch Normal file
View File

@ -0,0 +1,25 @@
--- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100
+++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200
@@ -314,10 +314,8 @@
#
# PyQT checks
-build_mixer = False
-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
- env['PYUIC4'] = True
- build_mixer = True
+env['PYUIC4'] = True
+build_mixer = True
if conf.CheckForApp( 'xdg-desktop-menu --help' ):
env['XDG_TOOLS'] = True
@@ -348,7 +346,8 @@
name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
+
+if False:
env['DBUS1_FLAGS'] = ""
env['DBUSC1_FLAGS'] = ""
print """