Merge pull request #331539 from K900/prusa-clang

prusa-slicer: build with clang
This commit is contained in:
K900 2024-08-07 20:01:39 +03:00 committed by GitHub
commit 4335dfc6e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions

View File

@ -128,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: {
# prusa-slicer uses dlopen on `libudev.so` at runtime
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
# FIXME: remove in 2.8.0
NIX_CFLAGS_COMPILE = "-Wno-enum-constexpr-conversion";
prePatch = ''
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
# now seems to be integrated into the main lib.

View File

@ -33630,7 +33630,10 @@ with pkgs;
printrun = callPackage ../applications/misc/printrun { };
prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer {
stdenv = if stdenv.isDarwin then overrideSDK llvmPackages_14.stdenv "11.0" else stdenv;
# Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
# on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
# with --cores 32 on clang).
stdenv = if stdenv.isDarwin then overrideSDK llvmPackages.stdenv "11.0" else llvmPackages.stdenv;
};
super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };