talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

orca-slicer: fixing build on GCC < 14

Browse Source
This commit is contained in:
Eduwardo Horibe 2025-03-24 21:46:35 -03:00
parent 800863744b
commit b86e92c05d
No known key found for this signature in database
GPG Key ID: 6E877A30340E5633
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/or/orca-slicer/package.nix
View File

@ -145,10 +145,10 @@ stdenv.mkDerivation (finalAttrs: {
NLOPT = nlopt; NLOPT = nlopt;
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString (
[
"-Wno-ignored-attributes" "-Wno-ignored-attributes"
"-I${opencv.out}/include/opencv4" "-I${opencv.out}/include/opencv4"
"-Wno-error=template-id-cdtor"
"-Wno-error=incompatible-pointer-types" "-Wno-error=incompatible-pointer-types"
"-Wno-template-id-cdtor" "-Wno-template-id-cdtor"
"-Wno-uninitialized" "-Wno-uninitialized"
@ -165,7 +165,12 @@ stdenv.mkDerivation (finalAttrs: {
"-DBOOST_MATH_MAX_FLOAT128_DIGITS=0" "-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
"-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT" "-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
"-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY" "-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 [ NIX_LDFLAGS = toString [
(lib.optionalString withSystemd "-ludev") (lib.optionalString withSystemd "-ludev")