cgal -> cgal_5 if package breaks with cgal v6.0.1

This commit is contained in:
Ravi Peters
2025-08-22 12:11:34 +02:00
parent 74ef9bac2f
commit 5b27e57a8b
7 changed files with 13 additions and 11 deletions
@@ -8,7 +8,7 @@
wrapGAppsHook3,
boost186,
cereal,
cgal,
cgal_5,
curl,
dbus,
eigen,
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
binutils
boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
cereal
cgal
cgal_5
curl
dbus
eigen
+2 -2
View File
@@ -6,7 +6,7 @@
cmake,
pkg-config,
mpi,
cgal,
cgal_5,
boost,
gmp,
mpfr,
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
mpi
cgal
cgal_5
sparsehash
imagemagick
# should be propagated by cgal
+2 -2
View File
@@ -12,7 +12,7 @@
libGL,
glew,
opencsg,
cgal,
cgal_5,
mpfr,
gmp,
glib,
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
boost
glew
opencsg
cgal
cgal_5
mpfr
gmp
glib
+2 -2
View File
@@ -9,7 +9,7 @@
wrapGAppsHook3,
boost186,
cereal,
cgal,
cgal_5,
curl,
dbus,
eigen,
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
})
boost186.dev
cereal
cgal
cgal_5
curl
dbus
eigen
@@ -16,7 +16,7 @@
# native dependencies
eigen,
boost,
cgal,
cgal_5,
gmp,
hdf5,
icu,
@@ -93,7 +93,7 @@ buildPythonPackage rec {
# ifcopenshell needs stdc++
(lib.getLib stdenv.cc.cc)
boost
cgal
cgal_5
eigen
gmp
hdf5
+2
View File
@@ -320,6 +320,8 @@ with pkgs;
cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
cgal_5 = callPackage ../by-name/cg/cgal/5.nix { };
checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix { };
celeste-classic-pm = pkgs.celeste-classic.override {
+1 -1
View File
@@ -6909,7 +6909,7 @@ self: super: with self; {
ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
ifcopenshell = callPackage ../development/python-modules/ifcopenshell {
inherit (pkgs) cgal libxml2;
inherit (pkgs) cgal_5 libxml2;
};
igloohome-api = callPackage ../development/python-modules/igloohome-api { };