dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #96564 from K900/murmur-grpc

Browse Source 
murmur: support building with grpc
This commit is contained in:
Silvan Mosberger 2020-09-03 18:01:32 +02:00 committed by GitHub
commit 7ff50a7f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
, speechdSupport ? false, speechd ? null , speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, iceSupport ? false, zeroc-ice ? null , iceSupport ? false, zeroc-ice ? null
, grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null
, nixosTests , nixosTests
}: }:
@ -13,6 +14,7 @@ assert jackSupport -> libjack2 != null;
assert speechdSupport -> speechd != null; assert speechdSupport -> speechd != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert iceSupport -> zeroc-ice != null; assert iceSupport -> zeroc-ice != null;
assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null);
with stdenv.lib; with stdenv.lib;
let let
@ -117,9 +119,12 @@ let
configureFlags = [ configureFlags = [
"CONFIG+=no-client" "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 = '' installPhase = ''
# bin stuff # bin stuff

1
pkgs/top-level/all-packages.nix
View File

@ -21910,6 +21910,7 @@ in
avahi = avahi-compat; avahi = avahi-compat;
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true; iceSupport = config.murmur.iceSupport or true;
grpcSupport = config.murmur.grpcSupport or true;
}).murmur; }).murmur;
mumble = (callPackages ../applications/networking/mumble { mumble = (callPackages ../applications/networking/mumble {