From cf6f9748b745e9306e1091608170145ced5f0b3d Mon Sep 17 00:00:00 2001 From: "Hedtke, Moritz" Date: Sun, 14 Mar 2021 00:15:33 +0100 Subject: [PATCH] grpc: fix build input propagation --- pkgs/applications/networking/mumble/default.nix | 4 ++-- pkgs/development/libraries/grpc/default.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 4432d9ddeece..088391ba48f7 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,7 +6,7 @@ , speechdSupport ? false, speechd , pulseSupport ? false, libpulseaudio , iceSupport ? false, zeroc-ice -, grpcSupport ? false, grpc, c-ares, abseil-cpp, which +, grpcSupport ? false, grpc, which , nixosTests }: @@ -115,7 +115,7 @@ let buildInputs = [ libcap ] ++ lib.optional iceSupport zeroc-ice - ++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ]; + ++ lib.optionals grpcSupport [ grpc which ]; installPhase = '' # bin stuff diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 5374dc75e1a8..780f8c5f0b5a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ] + propagatedBuildInputs = [ c-ares re2 zlib ]; + buildInputs = [ c-ares.cmake-config openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags =