Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-11-11 22:28:32 +01:00
34 changed files with 354 additions and 253 deletions
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-DWITH_ZLIB=1"
"-DWITH_ZSTD=1"
"-DWITH_GFLAGS=0"
"-DUSE_RTTI=1"
(lib.optional
(stdenv.hostPlatform.system == "i686-linux"
|| stdenv.hostPlatform.system == "x86_64-linux")