public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116317 from mohe2015/mumble

Browse Source 
grpc: fix build input propagation
This commit is contained in:
Mario Rodas 2021-03-15 20:58:10 -05:00 committed by GitHub
commit 269236f5f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/mumble/default.nix
View File

@ -6,7 +6,7 @@
, speechdSupport ? false, speechd , speechdSupport ? false, speechd
, pulseSupport ? false, libpulseaudio , pulseSupport ? false, libpulseaudio
, iceSupport ? false, zeroc-ice , iceSupport ? false, zeroc-ice
, grpcSupport ? false, grpc, c-ares, abseil-cpp, which , grpcSupport ? false, grpc, which
, nixosTests , nixosTests
}: }:
@ -115,7 +115,7 @@ let
buildInputs = [ libcap ] buildInputs = [ libcap ]
++ lib.optional iceSupport zeroc-ice ++ lib.optional iceSupport zeroc-ice
++ lib.optionals grpcSupport [ grpc c-ares abseil-cpp which ]; ++ lib.optionals grpcSupport [ grpc which ];
installPhase = '' installPhase = ''
# bin stuff # bin stuff

3
pkgs/development/libraries/grpc/default.nix
View File

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkg-config ]; 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 ]; ++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags = cmakeFlags =