slic3r: unpin boost172
This commit is contained in:
parent
ac6d8999f0
commit
20933bf34a
3 changed files with 16 additions and 20 deletions
|
@ -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 <boost/asio.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
+#include <boost/core/noncopyable.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
|
|
@ -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"|<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
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue