ffado: 2.4.0 → 2.4.1

Update, switch to Python 3, Qt 5, libxmlxx3, and clean up the expression.
This commit is contained in:
Jan Tojnar 2019-03-03 02:45:04 +01:00
parent c28848a3b3
commit 8b1816ec5a
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 57 additions and 37 deletions

View file

@ -1,61 +1,57 @@
{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx
{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3
, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3
, glibmm
, alsaLib, dbus, dbus_cplusplus
, pyqt4, dbus-python
}:
stdenv.mkDerivation rec {
name = "ffado-${version}";
version = "2.4.0";
let
inherit (python3.pkgs) pyqt5 dbus-python;
python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]);
in stdenv.mkDerivation rec {
pname = "ffado";
version = "2.4.1";
src = fetchurl {
url = "http://www.ffado.org/files/libffado-${version}.tgz";
sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y";
};
patches = [
# fix installing metainfo file
./fix-build.patch
];
outputs = [ "out" "bin" "dev" ];
nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ];
prefixKey = "PREFIX=";
sconsFlags = [
"DEBUG=False"
"ENABLE_ALL=True"
"SERIALIZE_USE_EXPAT=True"
"BUILD_TESTS=False"
"WILL_DEAL_WITH_XDG_MYSELF=True"
"BUILD_MIXER=True"
"UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
"PYPKGDIR=${placeholder "out"}/${python3.sitePackages}"
"BINDIR=${placeholder "bin"}/bin"
"INCLUDEDIR=${placeholder "dev"}/include"
"PYTHON_INTERPRETER=${python.interpreter}"
];
configurePhase = ''
mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \
$out/lib/${python.libPrefix}/site-packages
sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d)
sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages)
sconsFlagsArray+=(BINDIR=$bin/bin)
sconsFlagsArray+=(INCLUDEDIR=$dev/include)
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
'';
buildInputs = [
expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus
libxmlxx pyqt4 dbus-python glibmm
libraw1394
libconfig
libavc1394
libiec61883
dbus
dbus_cplusplus
libxmlxx3
python
glibmm
];
postPatch = ''
sed '1iimport sys' -i SConstruct
'';
postInstall = ''
for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do
wrapProgram $exe \
--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \
--prefix PYTHONPATH : $out/share/libffado/python \
--prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \
--prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages
done
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.ffado.org;

View file

@ -0,0 +1,26 @@
From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 3 Mar 2019 11:50:27 +0100
Subject: [PATCH] Fix build on Nix
We do not have global /usr.
---
SConstruct | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 05755e4b..3fbdc1d8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env )
env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env )
env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env )
env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env )
-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env )
+env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env )
env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
--
2.19.2

View file

@ -14432,9 +14432,7 @@ in
fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = callPackage ../os-specific/linux/ffado {
inherit (python2Packages) python pyqt4 dbus-python;
};
ffado = callPackage ../os-specific/linux/ffado { };
libffado = ffado;
fbterm = callPackage ../os-specific/linux/fbterm { };