diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 31c05f3d0bb3e..40760093462ac 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, ninja +{ stdenv, fetchFromGitHub, cmake, libtool, lldClang, 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 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr"; }; - nativeBuildInputs = [ cmake libtool ninja ]; + nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; buildInputs = [ boost brotli capnproto cctz clang-unwrapped double-conversion gperftools icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" - "-DLINKER_NAME=gold" # lld is not wrapped with ld-wrapper.sh, does not set rpath. "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 636cffaeec5e3..34367904190b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15254,7 +15254,7 @@ in clickhouse = callPackage ../servers/clickhouse { # clickhouse doesn't build on llvm8. - inherit (llvmPackages_7) clang-unwrapped lld llvm; + inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb {