From 68440b41d960f30d50d1ad769eb64be3b1eebdbf Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sun, 10 Nov 2024 13:52:54 -0800 Subject: [PATCH] doxygen: fix build with clang-19 --- .../tools/documentation/doxygen/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index eccfd06e2889..e3a0f9609c0e 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -24,6 +24,24 @@ stdenv.mkDerivation rec { hash = "sha256-4zSaM49TjOaZvrUChM4dNJLondCsQPSArOXZnTHS4yI="; }; + patches = [ + # fix clang-19 build. can drop on next update + # https://github.com/doxygen/doxygen/pull/11064 + (fetchpatch { + name = "fix-clang-19-build.patch"; + url = "https://github.com/doxygen/doxygen/commit/cff64a87dea7596fd506a85521d4df4616dc845f.patch"; + hash = "sha256-TtkVfV9Ep8/+VGbTjP4NOP8K3p1+A78M+voAIQ+lzOk="; + }) + ]; + + # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'JAVACC_CHAR_TYPE=\"unsigned char\"' \ + 'JAVACC_CHAR_TYPE=\"char8_t\"' \ + --replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20" + ''; + nativeBuildInputs = [ cmake python3