diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2014-09-23 17:58:56 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-09-29 10:24:35 +0200 |
commit | c9494b8090a07846bdddb6dfcabceb51ceeb547d (patch) | |
tree | badbc79394ab4648de093728a5fcaf1348c4bdde /pkgs | |
parent | 04b3932117e4ffd7fff2529684349303e87ffe19 (diff) | |
download | nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar.gz nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar.bz2 nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar.lz nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar.xz nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.tar.zst nixlib-c9494b8090a07846bdddb6dfcabceb51ceeb547d.zip |
Making tox/toxic A/V libs disabled in ARM.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 6 | ||||
-rw-r--r-- | 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 4e896f957846..6b33c712c612 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 25f6527e98a0..a828c4617d99 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"; |