diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/pkgs/applications/misc/slic3r/boost-compile-error.patch deleted file mode 100644 index 4dbdb85f743d..000000000000 --- a/pkgs/applications/misc/slic3r/boost-compile-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp -index cc0b2983..0f39f5a3 100644 ---- a/xs/src/libslic3r/GCodeSender.hpp -+++ b/xs/src/libslic3r/GCodeSender.hpp -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - namespace Slic3r { - diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 2a7ff5940b4f..923e480c1f0f 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper , makeDesktopItem, which, perlPackages, boost, wrapGAppsHook }: @@ -42,10 +42,20 @@ stdenv.mkDerivation rec { sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp ''; - # note the boost-compile-error is fixed in - # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68 - # this patch can be probably be removed in the next version after 1.3.0 - patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch; + patches = [ + (fetchpatch { + url = "https://web.archive.org/web/20230606220657if_/https://sources.debian.org/data/main/s/slic3r/1.3.0%2Bdfsg1-5/debian/patches/Drop-error-admesh-works-correctly-on-little-endian-machin.patch"; + hash = "sha256-+F94jzMFBdI++SKgyEZTBaHFVbjxWwgJa8YVbpK0euI="; + }) + (fetchpatch { + url = "https://web.archive.org/web/20230606220036if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch"; + hash = "sha256-4jvNccttig5YI1hXSANAWxVz6C4+kowlacMXVCpFgOo="; + }) + (fetchpatch { + url = "https://web.archive.org/web/20230606220054if_/https://sources.debian.org/data/main/s/slic3r/1.3.0+dfsg1-5/debian/patches/fix_boost_174.patch"; + hash = "sha256-aSmxc2htmrla9l/DIRWeKdBW0LTV96wMUZSLLNjgbzY="; + }) + ]; buildPhase = '' export SLIC3R_NO_AUTO=true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 349550028226..47f894769706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34329,9 +34329,7 @@ with pkgs; ly = callPackage ../applications/display-managers/ly { }; - slic3r = callPackage ../applications/misc/slic3r { - boost = boost172; # Building fails with Boost >1.72 due to boost/detail/endian.hpp missing - }; + slic3r = callPackage ../applications/misc/slic3r { }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };