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

clickhouse: link with lld

Browse Source 
lld buildInput is still needed for the library.

Related: #24744
This commit is contained in:
Orivej Desh 2020-03-03 09:18:33 +00:00
parent 0da63e8af2
commit a8e06a8e89
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libtool, ninja { stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl
, poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC , poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr"; sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr";
}; };
nativeBuildInputs = [ cmake libtool ninja ]; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
buildInputs = [ buildInputs = [
boost brotli capnproto cctz clang-unwrapped double-conversion gperftools boost brotli capnproto cctz clang-unwrapped double-conversion gperftools
icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_TESTS=OFF" "-DENABLE_TESTS=OFF"
"-DLINKER_NAME=gold" # lld is not wrapped with ld-wrapper.sh, does not set rpath.
"-DUNBUNDLED=ON" "-DUNBUNDLED=ON"
"-DUSE_STATIC_LIBRARIES=OFF" "-DUSE_STATIC_LIBRARIES=OFF"
]; ];

2
pkgs/top-level/all-packages.nix
View File

@ -15254,7 +15254,7 @@ in
clickhouse = callPackage ../servers/clickhouse { clickhouse = callPackage ../servers/clickhouse {
# clickhouse doesn't build on llvm8. # 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 { couchdb = callPackage ../servers/http/couchdb {