mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-27 23:33:30 +00:00
prusa-slicer: build with clang
See comment for why.
This commit is contained in:
parent
ec935c52c2
commit
2ab6654672
@ -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.
|
||||
|
@ -33835,7 +33835,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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user