ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-12 23:48:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #249883 from K900/mumble-fix-alternative

Browse Source 
[staging-next] mumble: disable grpc, pin old protobuf version
This commit is contained in:
K900 2023-08-18 18:28:45 +03:00 committed by GitHub
commit e0c33d7b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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 {

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

@ -33845,13 +33845,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 {