From bcc1a0be3bb6d71936fd31eadec62b15e9162ed7 Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Fri, 20 Dec 2024 14:30:26 +0900 Subject: [PATCH] modern-cpp-kafka: clean up cmake flags --- pkgs/by-name/mo/modern-cpp-kafka/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix index 3a73192a3ad4..431014c6b5ad 100644 --- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix +++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix @@ -53,13 +53,18 @@ stdenv.mkDerivation rec { buildInputs = [ boost ]; propagatedBuildInputs = [ rdkafka ]; - cmakeFlags = [ - "-DLIBRDKAFKA_INCLUDE_DIR=${rdkafka.out}/include" - "-DGTEST_LIBRARY_DIR=${gtest.out}/lib" - "-DGTEST_INCLUDE_DIR=${gtest.dev}/include" - "-DRAPIDJSON_INCLUDE_DIRS=${rapidjson.out}/include" - "-DCMAKE_CXX_FLAGS=-Wno-uninitialized" - ]; + cmakeFlags = + let + inherit (lib) cmakeFeature getLib getInclude; + in + [ + (cmakeFeature "LIBRDKAFKA_LIBRARY_DIR" "${getLib rdkafka}/lib") + (cmakeFeature "LIBRDKAFKA_INCLUDE_DIR" "${getInclude rdkafka}/include") + (cmakeFeature "GTEST_LIBRARY_DIR" "${getLib gtest}/lib") + (cmakeFeature "GTEST_INCLUDE_DIR" "${getInclude gtest}/include") + (cmakeFeature "RAPIDJSON_INCLUDE_DIRS" "${getInclude rapidjson}/include") + (cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-uninitialized") + ]; checkInputs = [ gtest