From c9494b8090a07846bdddb6dfcabceb51ceeb547d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Sep 2014 17:58:56 +0200 Subject: [PATCH] Making tox/toxic A/V libs disabled in ARM. --- .../networking/instant-messengers/toxic/default.nix | 6 ++++-- pkgs/development/libraries/libtoxcore/default.nix | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4e896f95784..6b33c712c61 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -15,8 +15,10 @@ in stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ - autoconf libtool automake libtoxcore libsodium ncurses openal libvpx - freealut libconfig pkgconfig + autoconf libtool automake libtoxcore libsodium ncurses + libconfig pkgconfig + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + openal libvpx freealut ]; meta = { diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 25f6527e98a..a828c4617d9 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -36,13 +36,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses libopus - check libconfig pkgconfig + autoconf libtool automake libsodium ncurses + libconfig pkgconfig + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + libopus libvpx ]; + propagatedBuildInputs = [ libvpx ]; - doCheck = true; + doCheck = !stdenv.isArm; meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";