diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-09-03 18:01:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 18:01:32 +0200 |
| commit | 7ff50a7f7b9a701228f870813fe58f01950f870b (patch) | |
| tree | b0f217149320c0496f345e7bc5a8c57a4a7e87ea | |
| parent | c643d583498157128e5722898265ab81f76b0a6e (diff) | |
| parent | f02ac20f95537ecb7e33426237d159e2f20aa479 (diff) | |
Merge pull request #96564 from K900/murmur-grpc
murmur: support building with grpc
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 8490c0509a1c..c205f18e3663 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null , nixosTests }: @@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; assert iceSupport -> zeroc-ice != null; +assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); with stdenv.lib; let @@ -117,9 +119,12 @@ let configureFlags = [ "CONFIG+=no-client" - ] ++ optional (!iceSupport) "CONFIG+=no-ice"; + ] ++ optional (!iceSupport) "CONFIG+=no-ice" + ++ optional grpcSupport "CONFIG+=grpc"; - buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; + buildInputs = [ libcap ] + ++ optional iceSupport zeroc-ice + ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; installPhase = '' # bin stuff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95ff71ee31b3..1c0846b90fc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21910,6 +21910,7 @@ in avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; + grpcSupport = config.murmur.grpcSupport or true; }).murmur; mumble = (callPackages ../applications/networking/mumble { |