pyrox.dev
slic3r: patch to fix compile error if Boost > 1.55
authored by
Marcus Boyd
and committed by
Bjørn Forsman
4692b6e3
e237d884
+12
pkgs/applications/misc/slic3r/boost-compile-error.patch
+12
pkgs/applications/misc/slic3r/boost-compile-error.patch
···
1
+
diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
2
+
index cc0b2983..0f39f5a3 100644
3
+
--- a/xs/src/libslic3r/GCodeSender.hpp
4
+
+++ b/xs/src/libslic3r/GCodeSender.hpp
5
+
@@ -9,6 +9,7 @@
6
+
#include <boost/asio.hpp>
7
+
#include <boost/bind.hpp>
8
+
#include <boost/thread.hpp>
9
+
+#include <boost/core/noncopyable.hpp>
10
+
11
+
namespace Slic3r {
12
+
+7
-2
pkgs/applications/misc/slic3r/default.nix
+7
-2
pkgs/applications/misc/slic3r/default.nix
···
1
-
{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
2
-
, which, perlPackages, boost
1
+
{ lib, stdenv, fetchgit, perl, makeWrapper
2
+
, makeDesktopItem, which, perlPackages, boost
3
3
}:
4
4
5
5
stdenv.mkDerivation rec {
···
39
39
# one in the kernel, we use that one instead.
40
40
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
41
41
'';
42
+
43
+
# note the boost-compile-error is fixed in
44
+
# https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68
45
+
# this patch can be probably be removed in the next version after 1.3.0
46
+
patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch;
42
47
43
48
buildPhase = ''
44
49
export SLIC3R_NO_AUTO=true