clickhouse: 18.1.0 -> 18.5.1, fix build and use ninja

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-08-07 17:54:32 -05:00
parent a240276ccb
commit 6220a31908

View File

@ -1,30 +1,37 @@
{ stdenv, fetchFromGitHub, cmake, libtool { stdenv, fetchFromGitHub, cmake, libtool
, boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu
, libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka
, readline, sparsehash, unixODBC, zstd , readline, sparsehash, unixODBC, zstd, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clickhouse-${version}"; name = "clickhouse-${version}";
version = "18.5.1";
version = "18.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yandex"; owner = "yandex";
repo = "ClickHouse"; repo = "ClickHouse";
rev = "v${version}-stable"; rev = "v${version}-stable";
sha256 = "1vsfnggf69xh91ndycdxwfz6m2bs7psaxf2bh04svgk1vzj2z4l0"; sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31";
}; };
nativeBuildInputs = [ cmake libtool ]; nativeBuildInputs = [ cmake libtool ninja ];
buildInputs = [ buildInputs = [
boost capnproto cctz clang-unwrapped double-conversion gperftools icu 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 mysql.connector-c openssl poco re2 rdkafka
readline sparsehash unixODBC zstd readline sparsehash unixODBC zstd
]; ];
cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; cmakeFlags = [
"-DENABLE_TESTS=OFF"
"-DUNBUNDLED=ON"
"-DUSE_STATIC_LIBRARIES=OFF"
];
hardeningDisable = [ "format" ];
patchPhase = ''
patchShebangs .
'';
postInstall = '' postInstall = ''
rm -rf $out/share/clickhouse-test rm -rf $out/share/clickhouse-test