dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mumble: disable grpc, pin old protobuf version

Browse Source
This commit is contained in:
K900 2023-08-18 08:49:06 +03:00
parent 636fd56f69
commit fbea8bb3e8
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/mumble/default.nix
View File

@ -7,7 +7,6 @@
, flac , flac
, libogg , libogg
, libvorbis , libvorbis
, grpcSupport ? false, grpc, which
, iceSupport ? true, zeroc-ice , iceSupport ? true, zeroc-ice
, jackSupport ? false, libjack2 , jackSupport ? false, libjack2
, pipewireSupport ? true, pipewire , pipewireSupport ? true, pipewire
@ -100,12 +99,10 @@ let
"-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D CMAKE_PREFIX_PATH=${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" "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice"
] ];
++ lib.optional grpcSupport "-D grpc=ON";
buildInputs = [ libcap ] buildInputs = [ libcap ]
++ lib.optional iceSupport zeroc-ice ++ lib.optional iceSupport zeroc-ice;
++ lib.optionals grpcSupport [ grpc which ];
} source; } source;
source = rec { source = rec {

3
pkgs/top-level/all-packages.nix
View File

@ -33835,13 +33835,14 @@ with pkgs;
avahi = avahi-compat; avahi = avahi-compat;
pulseSupport = config.pulseaudio or false; pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true; iceSupport = config.murmur.iceSupport or true;
grpcSupport = config.murmur.grpcSupport or true; protobuf = protobuf3_21;
}).murmur; }).murmur;
mumble = (callPackages ../applications/networking/mumble { mumble = (callPackages ../applications/networking/mumble {
avahi = avahi-compat; avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false; jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false; speechdSupport = config.mumble.speechdSupport or false;
protobuf = protobuf3_21;
}).mumble; }).mumble;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {