Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/libraries/openexr/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
extraPrefix = "OpenEXR/IlmImf/";
sha256 = "sha256-DrpldpNgN5pWKzIuuPIrynGX3EpP8YhJlu+lLfNFGxQ=";
})

# Backport gcc-13 fix:
# https://github.com/AcademySoftwareFoundation/openexr/pull/1264
./gcc-13.patch
];

# tests are determined to use /var/tmp on unix
Expand Down
33 changes: 33 additions & 0 deletions pkgs/development/libraries/openexr/gcc-13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
https://github.com/AcademySoftwareFoundation/openexr/pull/1264
https://github.com/AcademySoftwareFoundation/openexr/commit/d0088a3c6943a9a53fc24e29885414d082d531fe.patch

--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
@@ -159,6 +159,7 @@
#include <limits>

#include <cstddef>
+#include <cstdint>


// Windows specific addition to prevent the indirect import of the redefined min/max macros
--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++ b/OpenEXR/IlmImf/ImfHuf.cpp
@@ -53,6 +53,7 @@
#include <cstring>
#include <cassert>
#include <algorithm>
+#include <cstdint>


using namespace std;
--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++ b/OpenEXR/IlmImf/ImfMisc.cpp
@@ -52,6 +52,7 @@
#include <ImfConvert.h>
#include <ImfPartType.h>
#include <ImfTileDescription.h>
+#include <cstdint>
#include "ImfNamespace.h"

OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER