From fbccaa295a2bdea6001eb23936655dc1c079afef Mon Sep 17 00:00:00 2001 From: Kimberly Swanson Date: Sun, 16 Mar 2025 13:02:41 +0000 Subject: [PATCH] opentelemetry-cpp: add option to use STL --- pkgs/by-name/op/opentelemetry-cpp/package.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 8d7640cb12b2..3bc63013eba3 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -10,8 +10,8 @@ prometheus-cpp, nlohmann_json, nix-update-script, + cxxStandard ? null, }: - let opentelemetry-proto = fetchFromGitHub { owner = "open-telemetry"; @@ -53,17 +53,22 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DWITH_OTLP_HTTP=ON" - "-DWITH_OTLP_GRPC=ON" - "-DWITH_ABSEIL=ON" - "-DWITH_PROMETHEUS=ON" - "-DWITH_ELASTICSEARCH=ON" - "-DWITH_ZIPKIN=ON" - "-DWITH_BENCHMARK=OFF" - "-DOTELCPP_PROTO_PATH=${opentelemetry-proto}" - ]; + cmakeFlags = + [ + "-DBUILD_SHARED_LIBS=ON" + "-DWITH_OTLP_HTTP=ON" + "-DWITH_OTLP_GRPC=ON" + "-DWITH_ABSEIL=ON" + "-DWITH_PROMETHEUS=ON" + "-DWITH_ELASTICSEARCH=ON" + "-DWITH_ZIPKIN=ON" + "-DWITH_BENCHMARK=OFF" + "-DOTELCPP_PROTO_PATH=${opentelemetry-proto}" + ] + ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + "-DWITH_STL=CXX${cxxStandard}" + ]; outputs = [ "out"