Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

mumble: disable grpc, pin old protobuf version

K900 fbea8bb3 636fd56f

+4 -6
+2 -5
pkgs/applications/networking/mumble/default.nix
··· 7 , flac 8 , libogg 9 , libvorbis 10 - , grpcSupport ? false, grpc, which 11 , iceSupport ? true, zeroc-ice 12 , jackSupport ? false, libjack2 13 , pipewireSupport ? true, pipewire ··· 100 "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" 101 "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" 102 "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice" 103 - ] 104 - ++ lib.optional grpcSupport "-D grpc=ON"; 105 106 buildInputs = [ libcap ] 107 - ++ lib.optional iceSupport zeroc-ice 108 - ++ lib.optionals grpcSupport [ grpc which ]; 109 } source; 110 111 source = rec {
··· 7 , flac 8 , libogg 9 , libvorbis 10 , iceSupport ? true, zeroc-ice 11 , jackSupport ? false, libjack2 12 , pipewireSupport ? true, pipewire ··· 99 "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" 100 "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" 101 "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice" 102 + ]; 103 104 buildInputs = [ libcap ] 105 + ++ lib.optional iceSupport zeroc-ice; 106 } source; 107 108 source = rec {
+2 -1
pkgs/top-level/all-packages.nix
··· 33835 avahi = avahi-compat; 33836 pulseSupport = config.pulseaudio or false; 33837 iceSupport = config.murmur.iceSupport or true; 33838 - grpcSupport = config.murmur.grpcSupport or true; 33839 }).murmur; 33840 33841 mumble = (callPackages ../applications/networking/mumble { 33842 avahi = avahi-compat; 33843 jackSupport = config.mumble.jackSupport or false; 33844 speechdSupport = config.mumble.speechdSupport or false; 33845 }).mumble; 33846 33847 mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
··· 33835 avahi = avahi-compat; 33836 pulseSupport = config.pulseaudio or false; 33837 iceSupport = config.murmur.iceSupport or true; 33838 + protobuf = protobuf3_21; 33839 }).murmur; 33840 33841 mumble = (callPackages ../applications/networking/mumble { 33842 avahi = avahi-compat; 33843 jackSupport = config.mumble.jackSupport or false; 33844 speechdSupport = config.mumble.speechdSupport or false; 33845 + protobuf = protobuf3_21; 33846 }).mumble; 33847 33848 mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {