diff options
| author | Cillian de Róiste <cillian.deroiste@gmail.com> | 2014-08-24 19:50:22 +0200 |
|---|---|---|
| committer | Cillian de Róiste <cillian.deroiste@gmail.com> | 2014-08-24 19:50:22 +0200 |
| commit | df88d893320113a3768bc32af6b109d6d55c1e92 (patch) | |
| tree | 65cdc6842ed987ad384a3b7033b2e38fd27611cf /pkgs/os-specific/linux/ffado | |
| parent | 2478e77d8ac2d447eb0ee012f001e6c7d1a59d56 (diff) | |
| download | nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar.gz nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar.bz2 nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar.lz nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar.xz nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.tar.zst nixpkgs-df88d893320113a3768bc32af6b109d6d55c1e92.zip | |
FFADO: fix build on i686
Diffstat (limited to 'pkgs/os-specific/linux/ffado')
| -rw-r--r-- | pkgs/os-specific/linux/ffado/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
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 |