Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, libtool
, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka
, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libtool ninja ];
buildInputs = [
boost capnproto cctz clang-unwrapped double-conversion gperftools icu
libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka
libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka
readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash
];