commit 796fa8190e3bb398aa322fbe27da2f4c7b0e1e8b · pyrox.dev/nixpkgs

+8 -12

pkgs/servers/clickhouse/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools

     

       2
       2
       -
       , icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC

     

       3
       3
       -
       , zookeeper_mt, zstd }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, libtool, boost, cctz, double-conversion, gperftools

     

       2
       2
       +
       , icu, lz4, mysql, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zstd

     

       3
       3
       +
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "clickhouse-${version}";

     

       7
       7
        
       

     

       8
       8
       -
         version = "1.1.54310";

     

       8
       8
       +
         version = "1.1.54385";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "yandex";

     

       12
       12
        
           repo = "ClickHouse";

     

       13
       13
        
           rev = "v${version}-stable";

     

       14
       14
       -
           sha256 = "167pihqak8ip7bmlyrbzl9x3mpn381j8v7pl7nhrl9bfnzgrq69v";

     

       14
       14
       +
           sha256 = "0s290xnx9dil2lbxdir5p5zmakvq5h523gdwax2cb37606wg8yj7";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         patches = [ ./termcap.patch ];

     

       17
       17
       +
         patches = [ ./find-mysql.patch ./termcap.patch ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ cmake libtool ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

     

       22
       22
       -
           boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco

     

       23
       23
       -
           re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd

     

       22
       22
       +
           boost cctz double-conversion gperftools icu lz4 mysql.connector-c openssl poco

     

       23
       23
       +
           re2 rdkafka readline sparsehash unixODBC zstd

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ];

     

       27
       27
       -
       

     

       28
       28
       -
         NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ];

     

       29
       29
       -
       

     

       30
       30
       -
         enableParallelBuilding = true;

     

       31
       27
        
       

     

       32
       28
        
         meta = with stdenv.lib; {

     

       33
       29
        
           homepage = https://clickhouse.yandex/;

+11

pkgs/servers/clickhouse/find-mysql.patch

···

       1
       1
       +
       --- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake

     

       2
       2
       +
       +++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake

     

       3
       3
       +
       @@ -24,7 +24,7 @@ if (ENABLE_MYSQL)

     

       4
       4
       +
            if (USE_STATIC_LIBRARIES)

     

       5
       5
       +
                find_library (STATIC_MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})

     

       6
       6
       +
            else ()

     

       7
       7
       +
       -        find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS})

     

       8
       8
       +
       +        find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATH_SUFFIXES mysql PATHS ${MYSQL_LIB_PATHS})

     

       9
       9
       +
            endif ()

     

       10
       10
       +
        

     

       11
       11
       +
            if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES))