From b86e92c05d6331bd40d6fe6bbae59af965acc68a Mon Sep 17 00:00:00 2001 From: Eduwardo Horibe Date: Mon, 24 Mar 2025 21:46:35 -0300 Subject: [PATCH] orca-slicer: fixing build on GCC < 14 --- pkgs/by-name/or/orca-slicer/package.nix | 47 ++++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 223064576721..ac79481e65e6 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -145,27 +145,32 @@ stdenv.mkDerivation (finalAttrs: { NLOPT = nlopt; - 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" - "-Wno-unused-result" - "-Wno-deprecated-declarations" - "-Wno-use-after-free" - "-Wno-format-overflow" - "-Wno-stringop-overflow" - "-DBOOST_ALLOW_DEPRECATED_HEADERS" - "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY" - "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS" - "-DBOOST_MATH_DISABLE_FLOAT128" - "-DBOOST_MATH_NO_QUAD_SUPPORT" - "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0" - "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT" - "-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY" - ]; + NIX_CFLAGS_COMPILE = toString ( + [ + "-Wno-ignored-attributes" + "-I${opencv.out}/include/opencv4" + "-Wno-error=incompatible-pointer-types" + "-Wno-template-id-cdtor" + "-Wno-uninitialized" + "-Wno-unused-result" + "-Wno-deprecated-declarations" + "-Wno-use-after-free" + "-Wno-format-overflow" + "-Wno-stringop-overflow" + "-DBOOST_ALLOW_DEPRECATED_HEADERS" + "-DBOOST_MATH_DISABLE_STD_FPCLASSIFY" + "-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS" + "-DBOOST_MATH_DISABLE_FLOAT128" + "-DBOOST_MATH_NO_QUAD_SUPPORT" + "-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")