diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /pkgs/development/libraries/libtoxcore | |
parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
download | nixlib-153a19df05133657dd3025812a544f8961c41b12.tar nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixlib-153a19df05133657dd3025812a544f8961c41b12.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
Diffstat (limited to 'pkgs/development/libraries/libtoxcore')
-rw-r--r-- | pkgs/development/libraries/libtoxcore/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 994d22846773..b3636eef2621 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack , libvpx, check, libconfig, pkgconfig }: let @@ -20,7 +20,7 @@ let ]; buildInputs = [ - libsodium libmsgpack ncurses libconfig + libsodium msgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ libopus libvpx ]; |