Merge branch 'master' into staging-next

Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
parent ae2cf7c008 6755ab8b34
commit 153a19df05
187 changed files with 3389 additions and 1528 deletions
@@ -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
    ];