pyrox.dev
Merge pull request #178628 from gador/fix-prusa-slicer
prusa-slicer: fix boost 1.79 incompatibility
authored by Bernardo Meurer and committed by GitHub 70b75dd8 c7eacbf8
+49
-6
pkgs/applications/misc/prusa-slicer/default.nix
+49
-6
pkgs/applications/misc/prusa-slicer/default.nix
···
1
-
{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem
2
-
, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat
3
-
, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt
4
-
, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch
5
-
, wxGTK31-gtk3-override ? null }:
6
let
7
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
8
pname = "wxwidgets-prusa3d-patched";
···
16
};
17
});
18
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
19
-
in stdenv.mkDerivation rec {
20
pname = "prusa-slicer";
21
version = "2.4.2";
22
···
28
];
29
30
buildInputs = [
31
boost
32
cereal
33
cgal_5
···
57
(fetchpatch {
58
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
59
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
60
})
61
];
62
···
1
+
{ stdenv
2
+
, lib
3
+
, binutils
4
+
, fetchFromGitHub
5
+
, cmake
6
+
, copyDesktopItems
7
+
, makeDesktopItem
8
+
, pkg-config
9
+
, wrapGAppsHook
10
+
, boost
11
+
, cereal
12
+
, cgal_5
13
+
, curl
14
+
, dbus
15
+
, eigen
16
+
, expat
17
+
, glew
18
+
, glib
19
+
, gmp
20
+
, gtest
21
+
, gtk3
22
+
, hicolor-icon-theme
23
+
, ilmbase
24
+
, libpng
25
+
, mpfr
26
+
, nlopt
27
+
, openvdb
28
+
, pcre
29
+
, qhull
30
+
, systemd
31
+
, tbb
32
+
, wxGTK31-gtk3
33
+
, xorg
34
+
, fetchpatch
35
+
, wxGTK31-gtk3-override ? null
36
+
}:
37
let
38
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
39
pname = "wxwidgets-prusa3d-patched";
···
47
};
48
});
49
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
50
+
in
51
+
stdenv.mkDerivation rec {
52
pname = "prusa-slicer";
53
version = "2.4.2";
54
···
60
];
61
62
buildInputs = [
63
+
binutils
64
boost
65
cereal
66
cgal_5
···
90
(fetchpatch {
91
url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch";
92
sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6";
93
+
})
94
+
# Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238
95
+
# Can be removed with the next version update
96
+
(fetchpatch {
97
+
url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch";
98
+
sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8=";
99
+
})
100
+
(fetchpatch {
101
+
url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch";
102
+
sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20=";
103
})
104
];
105