Merge pull request #96564 from K900/murmur-grpc

murmur: support building with grpc

authored by Silvan Mosberger and committed by GitHub 7ff50a7f c643d583

+8 -2
+7 -2
pkgs/applications/networking/mumble/default.nix
··· 6 6 , speechdSupport ? false, speechd ? null 7 7 , pulseSupport ? false, libpulseaudio ? null 8 8 , iceSupport ? false, zeroc-ice ? null 9 + , grpcSupport ? false, grpc ? null, c-ares ? null, abseil-cpp ? null, which ? null 9 10 , nixosTests 10 11 }: 11 12 ··· 13 14 assert speechdSupport -> speechd != null; 14 15 assert pulseSupport -> libpulseaudio != null; 15 16 assert iceSupport -> zeroc-ice != null; 17 + assert grpcSupport -> (grpc != null && c-ares != null && abseil-cpp != null && which != null); 16 18 17 19 with stdenv.lib; 18 20 let ··· 117 119 118 120 configureFlags = [ 119 121 "CONFIG+=no-client" 120 - ] ++ optional (!iceSupport) "CONFIG+=no-ice"; 122 + ] ++ optional (!iceSupport) "CONFIG+=no-ice" 123 + ++ optional grpcSupport "CONFIG+=grpc"; 121 124 122 - buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; 125 + buildInputs = [ libcap ] 126 + ++ optional iceSupport zeroc-ice 127 + ++ optionals grpcSupport [ grpc c-ares abseil-cpp which ]; 123 128 124 129 installPhase = '' 125 130 # bin stuff
+1
pkgs/top-level/all-packages.nix
··· 21910 21910 avahi = avahi-compat; 21911 21911 pulseSupport = config.pulseaudio or false; 21912 21912 iceSupport = config.murmur.iceSupport or true; 21913 + grpcSupport = config.murmur.grpcSupport or true; 21913 21914 }).murmur; 21914 21915 21915 21916 mumble = (callPackages ../applications/networking/mumble {