nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mumble: fix build with C++20 (#568501)

Browse Source
This commit is contained in:
whispers
2026-09-30 16:45:53 +00:00
committed by GitHub
parent c7d46bae58 f62799aa03
commit b1d6406f4f
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,6 +154,7 @@ let
patches = [
./fix-plugin-copy.patch
./fix-plugin-updater-cxx20.patch
];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

34
pkgs/applications/networking/mumble/fix-plugin-updater-cxx20.patch Normal file
View File

@@ -0,0 +1,34 @@
Backported from upstream commit a2d5c363b5e457ed842971d68f8b945247cc4a04
("REFAC(plugin): Add constructors to UpdateEntry struct"), which landed on
master but was never backported to the 1.5.x branch. Adjusted for the
member ordering used in 1.5.x.
UpdateEntry declares a defaulted default constructor, which keeps it an
aggregate under C++17 but not under C++20, so the brace-enclosed initialiser
below stops compiling. abseil-cpp exports cxx_std_20 as an interface compile
feature and protobuf::libprotobuf propagates it, which raises the standard used
for the client targets above the C++17 requested via CMAKE_CXX_STANDARD.
--- a/src/mumble/PluginUpdater.h
+++ b/src/mumble/PluginUpdater.h
@@ -29,6 +29,8 @@
/// the same plugin.
struct UpdateEntry {
UpdateEntry() = default;
+ explicit UpdateEntry(plugin_id_t id, const QUrl &url, const QString &name, int redirectCount = 0)
+ : pluginID(id), updateURL(url), fileName(name), redirects(redirectCount) {}
plugin_id_t pluginID = std::numeric_limits< plugin_id_t >::max();
QUrl updateURL;
--- a/src/mumble/PluginUpdater.cpp
+++ b/src/mumble/PluginUpdater.cpp
@@ -45,8 +45,7 @@
QUrl updateURL = plugin->getUpdateDownloadURL();
if (updateURL.isValid() && !updateURL.isEmpty() && !updateURL.fileName().isEmpty()) {
- UpdateEntry entry = { plugin->getID(), updateURL, updateURL.fileName(), 0 };
- m_pluginsToUpdate << entry;
+ m_pluginsToUpdate.append(UpdateEntry(plugin->getID(), updateURL, updateURL.fileName()));
}
}