From df88d893320113a3768bc32af6b109d6d55c1e92 Mon Sep 17 00:00:00 2001 From: Cillian de RĂ³iste Date: Sun, 24 Aug 2014 19:50:22 +0200 Subject: FFADO: fix build on i686 --- pkgs/os-specific/linux/ffado/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index dc8d7b3d793..70c13be9ab4 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { patches = [ ./enable-mixer-and-dbus.patch ]; + # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch + # Let's just skip this and tell it which to build + postPatch = if stdenv.isi686 then '' + sed '/def is_userspace_32bit(cpuinfo):/a\ + return True' -i SConstruct + '' + else '' + sed '/def is_userspace_32bit(cpuinfo):/a\ + return False' -i SConstruct + ''; + # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR buildPhase = '' export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages -- cgit 1.4.1