Skip to content

Commit 5b3bbb9

Browse files
authored
mumble: unpin protobuf (#322756)
fixes pkgsMusl.mumble after musl 1.2.5 upgrade
1 parent ecd191f commit 5b3bbb9

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

pkgs/applications/networking/mumble/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ let
2727

2828
cmakeFlags = [
2929
"-D g15=OFF"
30+
"-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
3031
] ++ (overrides.configureFlags or [ ]);
3132

3233
preConfigure = ''

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32818,14 +32818,12 @@ with pkgs;
3281832818
avahi = avahi-compat;
3281932819
pulseSupport = config.pulseaudio or false;
3282032820
iceSupport = config.murmur.iceSupport or true;
32821-
protobuf = protobuf_21;
3282232821
}).murmur;
3282332822

3282432823
mumble = (callPackages ../applications/networking/mumble {
3282532824
avahi = avahi-compat;
3282632825
jackSupport = config.mumble.jackSupport or false;
3282732826
speechdSupport = config.mumble.speechdSupport or false;
32828-
protobuf = protobuf_21;
3282932827
}).mumble;
3283032828

3283132829
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {

0 commit comments

Comments
 (0)