From fbea8bb3e888a9b534bd3a809e6c7bcbf5ecd09b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 18 Aug 2023 08:49:06 +0300 Subject: mumble: disable grpc, pin old protobuf version --- pkgs/applications/networking/mumble/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/networking/mumble/default.nix') 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 { -- cgit 1.4.1