diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index f1b433ee31b0..18daaa405904 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -98,6 +98,17 @@ let postPatch = '' substituteInPlace Modules/ThirdParty/KWSys/src/KWSys/CMakeLists.txt \ --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)' + # fix build with GCC 15 + substituteInPlace Modules/ThirdParty/GoogleTest/src/itkgoogletest/googletest/src/gtest-death-test.cc \ + --replace-fail \ + '#include ' \ + '#include + #include ' + substituteInPlace Modules/Core/Common/include/itkFloatingPointExceptions.h \ + --replace-fail \ + '#include "itkSingletonMacro.h"' \ + '#include "itkSingletonMacro.h" + #include ' ''; # fix the CMake config files for ITK which contains double slashes diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index c55c362c6d4f..44b971d50ad6 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -94,6 +94,18 @@ stdenv.mkDerivation { ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters ln -sr ${rtkSrc} Modules/Remote/RTK + + # fix build with GCC 15 + substituteInPlace Modules/ThirdParty/GoogleTest/src/itkgoogletest/googletest/src/gtest-death-test.cc \ + --replace-fail \ + '#include ' \ + '#include + #include ' + substituteInPlace Modules/Core/Common/include/itkFloatingPointExceptions.h \ + --replace-fail \ + '#include "itkSingletonMacro.h"' \ + '#include "itkSingletonMacro.h" + #include ' ''; cmakeFlags = [