Merge branch 'master' into staging-next

2019-11-11 22:27:57 +01:00
parent cf27abf534 9fe897c1ec
commit 1b5a8a2cc6
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")