Skip to content

Commit c34b198

Browse files
committed
openscad: unpin cgal_4; fix darwin
1 parent 9f57922 commit c34b198

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

pkgs/applications/graphics/openscad/default.nix

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
libGL,
1515
glew,
1616
opencsg,
17-
cgal_4,
17+
cgal,
1818
mpfr,
1919
gmp,
2020
glib,
@@ -62,11 +62,32 @@ mkDerivation rec {
6262
url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch";
6363
sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM=";
6464
})
65+
(fetchpatch {
66+
# needed for cgal_5
67+
name = "cgalutils-tess.cc-cgal-5.patch";
68+
url = "https://github.com/openscad/openscad/commit/3a81c1fb9b663ebbedd6eb044e7276357b1f30a1.patch";
69+
hash = "sha256-JdBznXkewx5ybY92Ss0h7UnMZ7d3IQbFRaDCDjb1bRA=";
70+
})
71+
(fetchpatch {
72+
# needed for cgal_5
73+
name = "cgalutils-tess.cc-cgal-5_4.patch";
74+
url = "https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b.patch";
75+
hash = "sha256-Fu8dnjNIwZKCI6ukOeHYK8NiJwoA0XtqT8dg8sVevG8=";
76+
})
77+
(fetchpatch {
78+
# needed for cgal_5. Removes dead code
79+
name = "cgalutils-polyhedron.cc-cgal-5_3.patch";
80+
url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch";
81+
hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4=";
82+
})
6583
];
6684

6785
postPatch = ''
6886
substituteInPlace src/FileModule.cc \
6987
--replace-fail 'fs::is_regular' 'fs::is_regular_file'
88+
89+
substituteInPlace src/openscad.cc \
90+
--replace-fail 'boost::join' 'boost::algorithm::join'
7091
'';
7192

7293
nativeBuildInputs = [
@@ -84,7 +105,7 @@ mkDerivation rec {
84105
boost
85106
glew
86107
opencsg
87-
cgal_4
108+
cgal
88109
mpfr
89110
gmp
90111
glib

0 commit comments

Comments
 (0)