diff options
| author | Yureka <yuka@yuka.dev> | 2024-06-30 09:33:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 09:33:50 +0200 |
| commit | 5b3bbb9add5b59d4cbadb97cde6999df5d18a0f3 (patch) | |
| tree | 25061becedb5df9a61fdc988fdaabac449ed32a2 | |
| parent | ecd191fb8dde521d9e8700293628e815cb8f98e6 (diff) | |
mumble: unpin protobuf (#322756)
fixes pkgsMusl.mumble after musl 1.2.5 upgrade
| -rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b72e218ddcfb7..91ec4ee9c26ef 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-D g15=OFF" + "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 ] ++ (overrides.configureFlags or [ ]); preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5020c42dfb9b..d9ad333fae540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32818,14 +32818,12 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { |