diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-18 12:26:11 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-18 12:26:11 +0200 |
commit | c51c2f79b26b188c3bd47bcddfc82a525e8b785d (patch) | |
tree | 02f699abf18256223479b82c52d80c0a9a815110 /pkgs/servers/clickhouse/default.nix | |
parent | ddee2072598459877b3d34fc9f910dff494538b4 (diff) | |
parent | f702ae151685e0b29f73e71dfbf8fcdcb7d903b0 (diff) | |
download | nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.gz nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.bz2 nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.lz nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.xz nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.zst nixpkgs-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/clickhouse/default.nix')
-rw-r--r-- | pkgs/servers/clickhouse/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 6418bd917f1..f07ab98bbc4 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, libtool -, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu -, libcpuid, libxml2, lld, llvm, lz4 , libmysqlclient, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd, ninja, jemalloc, brotli, protobuf, xxHash +{ stdenv, fetchFromGitHub, cmake, libtool, ninja +, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools +, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl +, poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC +, xxHash, zstd }: stdenv.mkDerivation rec { @@ -17,9 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ - boost capnproto cctz clang-unwrapped double-conversion gperftools icu - libcpuid libxml2 lld llvm lz4 libmysqlclient openssl poco re2 rdkafka - readline sparsehash unixODBC zstd jemalloc brotli protobuf xxHash + boost brotli capnproto cctz clang-unwrapped double-conversion gperftools + icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl + poco protobuf rapidjson re2 rdkafka readline sparsehash unixODBC + xxHash zstd ]; cmakeFlags = [ |