orca-slicer: fixing build on GCC < 14
This commit is contained in:
parent
800863744b
commit
b86e92c05d
@ -145,10 +145,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
NLOPT = nlopt;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
[
|
||||
"-Wno-ignored-attributes"
|
||||
"-I${opencv.out}/include/opencv4"
|
||||
"-Wno-error=template-id-cdtor"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
"-Wno-template-id-cdtor"
|
||||
"-Wno-uninitialized"
|
||||
@ -165,7 +165,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
|
||||
"-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
|
||||
"-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
|
||||
];
|
||||
]
|
||||
# Making it compatible with GCC 14+, see https://github.com/SoftFever/OrcaSlicer/pull/7710
|
||||
++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14") [
|
||||
"-Wno-error=template-id-cdtor"
|
||||
]
|
||||
);
|
||||
|
||||
NIX_LDFLAGS = toString [
|
||||
(lib.optionalString withSystemd "-ludev")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user