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