From db3fdd01b03385160cf2ec8ac6394dcd5904d488 Mon Sep 17 00:00:00 2001 From: Alexander Rodin Date: Mon, 16 Dec 2019 13:55:49 +0000 Subject: [PATCH] vector: enable rdkafka feature --- pkgs/tools/misc/vector/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index a304873ca1e..3cf6b95ab43 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, rustPlatform , openssl, pkgconfig, protobuf -, Security, libiconv +, Security, libiconv, cmake , features ? (if stdenv.isAarch64 - then [ "shiplift/unix-socket" "jemallocator" ] - else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" ]) + then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/cmake_build" ] + else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/cmake_build" ]) }: rustPlatform.buildRustPackage rec { @@ -20,14 +20,13 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1akyzrscc6pv7ggb1kna05vvxhfzrf1b4kji4bah1ry3yyqxdjsj"; - buildInputs = [ openssl pkgconfig protobuf ] + buildInputs = [ openssl pkgconfig protobuf cmake ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library PROTOC="${protobuf}/bin/protoc"; PROTOC_INCLUDE="${protobuf}/include"; - # rdkafka fails to build, for some reason... cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; checkPhase = ":"; # skip tests, too -- they don't respect the rdkafka flag...