From f8c249118407e367d78127fd6c68eba9a3781dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Mar 2021 13:25:50 +0100 Subject: [PATCH] lightstep-tracer-cpp: remove packages which are no longer required after #116317, cleanup ? null --- .../libraries/lightstep-tracer-cpp/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index d47c7b50abef..8ef4513a18dd 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,12 +1,8 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, opentracing-cpp, protobuf, zlib -, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null +, opentracing-cpp, protobuf +, enableGrpc ? false, grpc, openssl }: -assert enableGrpc -> grpc != null; -assert enableGrpc -> openssl != null; -assert enableGrpc -> c-ares != null; - stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; version = "0.14.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opentracing-cpp protobuf zlib + opentracing-cpp protobuf ] ++ lib.optionals enableGrpc [ - grpc openssl c-ares c-ares.cmake-config + grpc openssl ]; cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ];