pyrox.dev
Merge pull request #236317 from wegank/slic3r-boost
slic3r: unpin boost172
authored by
Weijia Wang
and committed by
GitHub
755fab91
b506be0e
-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
-
+15
-5
pkgs/applications/misc/slic3r/default.nix
+15
-5
pkgs/applications/misc/slic3r/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, perl, makeWrapper
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper
2
2
, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook
3
3
}:
4
4
···
42
42
sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
43
43
'';
44
44
45
-
# note the boost-compile-error is fixed in
46
-
# https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68
47
-
# this patch can be probably be removed in the next version after 1.3.0
48
-
patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch;
45
+
patches = [
46
+
(fetchpatch {
47
+
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";
48
+
hash = "sha256-+F94jzMFBdI++SKgyEZTBaHFVbjxWwgJa8YVbpK0euI=";
49
+
})
50
+
(fetchpatch {
51
+
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";
52
+
hash = "sha256-4jvNccttig5YI1hXSANAWxVz6C4+kowlacMXVCpFgOo=";
53
+
})
54
+
(fetchpatch {
55
+
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";
56
+
hash = "sha256-aSmxc2htmrla9l/DIRWeKdBW0LTV96wMUZSLLNjgbzY=";
57
+
})
58
+
];
49
59
50
60
buildPhase = ''
51
61
export SLIC3R_NO_AUTO=true
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix
···
34325
34325
34326
34326
ly = callPackage ../applications/display-managers/ly { };
34327
34327
34328
-
slic3r = callPackage ../applications/misc/slic3r {
34329
-
boost = boost172; # Building fails with Boost >1.72 due to boost/detail/endian.hpp missing
34330
-
};
34328
+
slic3r = callPackage ../applications/misc/slic3r { };
34331
34329
34332
34330
curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
34333
34331