slic3r: patch to fix compile error if Boost > 1.55
This commit is contained in:
parent
e237d88432
commit
4692b6e320
12
pkgs/applications/misc/slic3r/boost-compile-error.patch
Normal file
12
pkgs/applications/misc/slic3r/boost-compile-error.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
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,5 +1,5 @@
|
|||
{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
|
||||
, which, perlPackages, boost
|
||||
{ lib, stdenv, fetchgit, perl, makeWrapper
|
||||
, makeDesktopItem, which, perlPackages, boost
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -40,6 +40,11 @@ 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;
|
||||
|
||||
buildPhase = ''
|
||||
export SLIC3R_NO_AUTO=true
|
||||
export LD=$CXX
|
||||
|
|
Loading…
Reference in New Issue
Block a user