diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index ad53e38ef7cf..12fbce05b962 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -35,6 +35,25 @@ stdenv.mkDerivation rec { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch"; hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk="; }) + (fetchpatch { + name = "luminance-hdr-Fix-building-with-Boost-1.85.0.patch"; + url = "https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f76b0edca4352cf701c1557d0c0e796c4f.patch"; + hash = "sha256-jzyfKFmmzo6WUOUn33gr1g4MbSVpRfKLUIi49PSF5cg="; + }) + # Fix lots of errors of form: + # include/boost/math/tools/type_traits.hpp:208:12: error: 'is_final' has not been declared in 'std' + (fetchpatch { + name = "luminancehdr-fix-boost-1.87.0-compilation.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/luminancehdr-fix-boost-1.87.0-compilation.patch"; + hash = "sha256-bKJhENnOWNwKUUSrSUF9fS1Por1A7exYAeiuCa2fRJY="; + }) + # Fix error: + # /build/source/src/Libpfs/manip/gamma_levels.cpp:136:25: error: call of overloaded 'clamp(float, float, float)' is ambiguous + (fetchpatch { + name = "luminancehdr-clamp.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/clamp.patch"; + hash = "sha256-iAcZV1lFREPzjA9J3feSdhyTougvQA11I0IQRRYOmxY="; + }) ]; env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";