gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avro-cpp: fix build with fmt 11 (#452150)

Browse Source
This commit is contained in:
kirillrdy
2025-10-16 05:41:43 +00:00
committed by GitHub
parent b439cfe1f1 6af2f8a95b
commit 46a22f4d4f
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/av/avro-cpp/0002-fix-fmt-name-formatter.patch
+11
View File
@@ -0,0 +1,11 @@
diff --git a/include/avro/Node.hh b/include/avro/Node.hh
--- a/include/avro/Node.hh
+++ b/include/avro/Node.hh
@@ -219,7 +219,7 @@ template<>
struct fmt::formatter<avro::Name> : fmt::formatter<std::string> {
template<typename FormatContext>
- auto format(const avro::Name &n, FormatContext &ctx) {
+ auto format(const avro::Name &n, FormatContext &ctx) const {
return fmt::formatter<std::string>::format(n.fullname(), ctx);
}
};
pkgs/by-name/av/avro-cpp/0003-fix-fmt-type-formatter.patch
+11
View File
@@ -0,0 +1,11 @@
diff --git a/include/avro/Types.hh b/include/avro/Types.hh
--- a/include/avro/Types.hh
+++ b/include/avro/Types.hh
@@ -113,7 +113,7 @@ template<>
struct fmt::formatter<avro::Type> : fmt::formatter<std::string> {
template<typename FormatContext>
- auto format(avro::Type t, FormatContext &ctx) {
+ auto format(avro::Type t, FormatContext &ctx) const {
return fmt::formatter<std::string>::format(avro::toString(t), ctx);
}
};
pkgs/by-name/av/avro-cpp/package.nix
+4
View File
@@ -18,8 +18,12 @@ stdenv.mkDerivation rec {
hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs=";
};
# TODO: remove fmt formatter patches when updating to next version
# Patches exist upstream but don't apply cleanly.
patches = [
./0001-get-rid-of-fmt-fetchcontent.patch
./0002-fix-fmt-name-formatter.patch
./0003-fix-fmt-type-formatter.patch
];
nativeBuildInputs = [