JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clickhouse: 1.1.54310 -> 1.1.54385

Browse Source
This commit is contained in:
Orivej Desh 2018-06-11 08:37:06 +00:00
parent 63a5b85b2a
commit 796fa8190e
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/clickhouse/default.nix
View File

@ -1,34 +1,30 @@
{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools
, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC
, zookeeper_mt, zstd }:
{ stdenv, fetchFromGitHub, cmake, libtool, boost, cctz, double-conversion, gperftools
, icu, lz4, mysql, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zstd
}:
stdenv.mkDerivation rec {
name = "clickhouse-${version}";
version = "1.1.54310";
version = "1.1.54385";
src = fetchFromGitHub {
owner = "yandex";
repo = "ClickHouse";
rev = "v${version}-stable";
sha256 = "167pihqak8ip7bmlyrbzl9x3mpn381j8v7pl7nhrl9bfnzgrq69v";
sha256 = "0s290xnx9dil2lbxdir5p5zmakvq5h523gdwax2cb37606wg8yj7";
};
patches = [ ./termcap.patch ];
patches = [ ./find-mysql.patch ./termcap.patch ];
nativeBuildInputs = [ cmake libtool ];
buildInputs = [
boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco
re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd
boost cctz double-conversion gperftools icu lz4 mysql.connector-c openssl poco
re2 rdkafka readline sparsehash unixODBC zstd
];
cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://clickhouse.yandex/;
description = "Column-oriented database management system";

11
pkgs/servers/clickhouse/find-mysql.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake
+++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
@@ -24,7 +24,7 @@ if (ENABLE_MYSQL)
if (USE_STATIC_LIBRARIES)
find_library (STATIC_MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
else ()
- find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})
+ find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATH_SUFFIXES mysql PATHS ${MYSQL_LIB_PATHS})
endif ()
if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES))