diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-07 13:15:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 13:15:03 +0300 |
| commit | 755fab910d4e2ece819302499bd038a8b522021c (patch) | |
| tree | f3da43b8fdd583c1f297852ccf0ea9a75690894d /pkgs/applications/misc | |
| parent | b506be0ef97e1df0258136776c63f1598cea5781 (diff) | |
| parent | 20933bf34a73af35b4e92957a99c63dd6d852a05 (diff) | |
Merge pull request #236317 from wegank/slic3r-boost
slic3r: unpin boost172
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/slic3r/boost-compile-error.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/misc/slic3r/default.nix | 20 |
2 files changed, 15 insertions, 17 deletions
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 4dbdb85f743d2..0000000000000 --- 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 <boost/asio.hpp> - #include <boost/bind.hpp> - #include <boost/thread.hpp> -+#include <boost/core/noncopyable.hpp> - - namespace Slic3r { - diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 2a7ff5940b4fc..923e480c1f0f6 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"|<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 |