diff options
| author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-01-16 08:30:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 08:30:39 -0800 |
| commit | d0ec78540c6627c122340e7d8c6ee6477008f6b5 (patch) | |
| tree | 7479debedef097f6b79d3db422fb4a019ba41168 /pkgs/applications/misc | |
| parent | 62c85d64d3cc44a047aa7ec98de7bbe82e48fd10 (diff) | |
| parent | 37a32b1e5ac00917d995c4b328b1956cc685480a (diff) | |
Merge pull request #281140 from aciceri/fix-curaengine
curaengine: fix build with GCC 13
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/curaengine/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 085fcab1475cc..2abe82913a4e2 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }: +{ lib, stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf, fetchpatch }: stdenv.mkDerivation rec { pname = "curaengine"; @@ -16,6 +16,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; + # TODO already fixed in master, remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch"; + hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ="; + includes = [ "src/utils/math.h" ]; + }) + ]; + meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; |