diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-12-18 07:15:50 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-12-18 18:18:00 +0100 |
| commit | 1791eeb7bd782b49b33998fa9152710f4117ffc2 (patch) | |
| tree | 257e39f7f856d3bfda24e20af6cdb5b797516c13 /pkgs/applications | |
| parent | 6ae8bce49df89886d5eb0ef95199a0f120d78b62 (diff) | |
| download | nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar.gz nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar.bz2 nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar.lz nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar.xz nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.tar.zst nixlib-1791eeb7bd782b49b33998fa9152710f4117ffc2.zip | |
cgal: default to version 5
Diffstat (limited to 'pkgs/applications')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index f2d008f7492b..7f8d9be53b85 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , boost -, cgal_5 +, cgal , eigen , flann , gdal @@ -41,7 +41,7 @@ mkDerivation rec { buildInputs = [ boost - cgal_5 + cgal flann gdal gmp diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 3da49cf80109..656713fb25e4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -14,7 +14,7 @@ , levmar , qhull , cmake -, cgal_5 +, cgal , boost179 , mpfr , xercesc @@ -45,7 +45,7 @@ mkDerivation rec { gmp levmar qhull - cgal_5 + cgal boost179 mpfr xercesc diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index fc048d4acae8..24d1fdc06ae8 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -11,7 +11,7 @@ , libGLU, libGL , glew , opencsg -, cgal +, cgal_4 , mpfr , gmp , glib @@ -60,7 +60,7 @@ mkDerivation rec { nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ - eigen boost glew opencsg cgal mpfr gmp glib + eigen boost glew opencsg cgal_4 mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla cairo ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8114f2ecb416..fa1a5c20e633 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook , boost , cereal -, cgal_5 +, cgal , curl , dbus , eigen @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { binutils boost cereal - cgal_5 + cgal curl dbus eigen diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index abdb0716f370..83ee992f4b28 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -4,7 +4,7 @@ , fparser , tinyxml , hdf5 -, cgal_5 +, cgal , vtk , boost , gmp @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [./searchPath.patch ]; buildInputs = [ - cgal_5 + cgal boost gmp mpfr |