diff options
author | Hedtke, Moritz <Moritz.Hedtke@t-online.de> | 2021-03-14 00:15:33 +0100 |
---|---|---|
committer | Hedtke, Moritz <Moritz.Hedtke@t-online.de> | 2021-03-15 23:56:19 +0100 |
commit | cf6f9748b745e9306e1091608170145ced5f0b3d (patch) | |
tree | a01b509cf393b427bc5effffb358652c0d6aa832 /pkgs | |
parent | 7d804ec1692d96c3810710098849531d8ca81d4d (diff) |
grpc: fix build input propagation
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 4 | ||||
-rw-r--r-- | 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 4432d9ddeece7..088391ba48f72 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 5374dc75e1a86..780f8c5f0b5ad 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 = |