about summary refs log tree commit diff
path: root/pkgs/servers/clickhouse
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-03-03 09:18:33 +0000
committerOrivej Desh <orivej@gmx.fr>2020-03-03 09:22:14 +0000
commita8e06a8e899394083e58585adeef59d88a0852a7 (patch)
treea1de5dfe5435fb508370abb26b2f3ba74e9ddace /pkgs/servers/clickhouse
parent0da63e8af275bd9be614ba9227a8bbe3fca537a2 (diff)
clickhouse: link with lld
lld buildInput is still needed for the library.

Related: #24744
Diffstat (limited to 'pkgs/servers/clickhouse')
-rw-r--r--pkgs/servers/clickhouse/default.nix5
1 files changed, 2 insertions, 3 deletions
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"
   ];