diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-01-10 04:05:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-10 04:05:37 +0100 |
| commit | fa63c00ff8c7edb6c20b698cfca355c8c4e0170a (patch) | |
| tree | f4f838641ccbb994dcbd17b60d01dc8be93d27e6 /pkgs/applications/graphics | |
| parent | 122355be994486ec9dbb4e1e87c9206bec11b521 (diff) | |
| parent | 95c05c41027486403bb6b6a3f61207c2967bca8b (diff) | |
Merge pull request #279904 from jansol/more-gcc13-include-fixes
More gcc13 include fixes
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/hdrmerge/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index a8db24c35283f..827ee15af60aa 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -37,6 +37,11 @@ mkDerivation rec { "-DALGLIB_DIR:PATH=${alglib}" ]; + CXXFLAGS = [ + # GCC 13: error: 'uint32_t' does not name a type + "-include cstdint" + ]; + patches = [ # https://github.com/jcelaya/hdrmerge/pull/222 (fetchpatch { diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 656713fb25e4e..bee1e35ec129a 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -75,6 +75,11 @@ mkDerivation rec { "-DALLOW_BUNDLED_LEVMAR=ON" ]; + CXXFLAGS = [ + # GCC 13: error: 'int16_t' has not been declared in 'std' + "-include cstdint" + ]; + postFixup = '' patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped ''; |