Merge pull request #279904 from jansol/more-gcc13-include-fixes
More gcc13 include fixes
This commit is contained in:
commit
fa63c00ff8
5 changed files with 26 additions and 0 deletions
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [ "-DTERMCOLOR_TESTS=ON" ];
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'uint8_t' has not been declared
|
||||
"-include cstdint"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL2 gtk3 freetype ];
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'uint32_t' has not been declared
|
||||
"-include cstdint"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GPU Trace Visualizer";
|
||||
homepage = "https://github.com/mikesart/gpuvis";
|
||||
|
|
|
@ -122,6 +122,13 @@ stdenv.mkDerivation rec {
|
|||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
];
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'snprintf' was not declared in this scope
|
||||
"-include cstdio"
|
||||
# GCC 13: error: 'runtime_error' is not a member of 'std'
|
||||
"-include stdexcept"
|
||||
];
|
||||
|
||||
# Extract binary from built app bundle
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir $out/bin
|
||||
|
|
Loading…
Reference in a new issue