diff options
| author | K900 <me@0upti.me> | 2023-08-18 08:49:06 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-08-18 08:49:06 +0300 |
| commit | fbea8bb3e888a9b534bd3a809e6c7bcbf5ecd09b (patch) | |
| tree | 68e275ce49654152dfd469e24afc004b1113e97d | |
| parent | 636fd56f6972388ab23287afe6b171f2f0839d06 (diff) | |
mumble: disable grpc, pin old protobuf version
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fdc649bd0b2ca..27fdde3c2a660 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -7,7 +7,6 @@ , flac , libogg , libvorbis -, grpcSupport ? false, grpc, which , iceSupport ? true, zeroc-ice , jackSupport ? false, libjack2 , pipewireSupport ? true, pipewire @@ -100,12 +99,10 @@ let "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice" - ] - ++ lib.optional grpcSupport "-D grpc=ON"; + ]; buildInputs = [ libcap ] - ++ lib.optional iceSupport zeroc-ice - ++ lib.optionals grpcSupport [ grpc which ]; + ++ lib.optional iceSupport zeroc-ice; } source; source = rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b750d1c3d852a..da9c9c8615d5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33835,13 +33835,14 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - grpcSupport = config.murmur.grpcSupport or true; + protobuf = protobuf3_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; + protobuf = protobuf3_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { |