prusa-slicer: fix boost 1.79 incompatibility
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
parent
14ff007ff6
commit
5a42a1382a
|
@ -1,8 +1,39 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
|
{ stdenv
|
||||||
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
|
, lib
|
||||||
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
|
, binutils
|
||||||
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
|
, fetchFromGitHub
|
||||||
, wxGTK31-gtk3-override ? null }:
|
, cmake
|
||||||
|
, copyDesktopItems
|
||||||
|
, makeDesktopItem
|
||||||
|
, pkg-config
|
||||||
|
, wrapGAppsHook
|
||||||
|
, boost
|
||||||
|
, cereal
|
||||||
|
, cgal_5
|
||||||
|
, curl
|
||||||
|
, dbus
|
||||||
|
, eigen
|
||||||
|
, expat
|
||||||
|
, glew
|
||||||
|
, glib
|
||||||
|
, gmp
|
||||||
|
, gtest
|
||||||
|
, gtk3
|
||||||
|
, hicolor-icon-theme
|
||||||
|
, ilmbase
|
||||||
|
, libpng
|
||||||
|
, mpfr
|
||||||
|
, nlopt
|
||||||
|
, openvdb
|
||||||
|
, pcre
|
||||||
|
, qhull
|
||||||
|
, systemd
|
||||||
|
, tbb
|
||||||
|
, wxGTK31-gtk3
|
||||||
|
, xorg
|
||||||
|
, fetchpatch
|
||||||
|
, wxGTK31-gtk3-override ? null
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
|
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
|
||||||
pname = "wxwidgets-prusa3d-patched";
|
pname = "wxwidgets-prusa3d-patched";
|
||||||
|
@ -16,7 +47,8 @@ let
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
|
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
|
||||||
in stdenv.mkDerivation rec {
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "prusa-slicer";
|
pname = "prusa-slicer";
|
||||||
version = "2.4.2";
|
version = "2.4.2";
|
||||||
|
|
||||||
|
@ -28,6 +60,7 @@ in stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
binutils
|
||||||
boost
|
boost
|
||||||
cereal
|
cereal
|
||||||
cgal_5
|
cgal_5
|
||||||
|
@ -58,6 +91,16 @@ in stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
|
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
|
||||||
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
|
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
|
||||||
})
|
})
|
||||||
|
# Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238
|
||||||
|
# Can be removed with the next version update
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch";
|
||||||
|
sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch";
|
||||||
|
sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
Loading…
Reference in a new issue