From 5b27e57a8ba64ba325826ed5c06bc6bbd064a526 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Fri, 22 Aug 2025 11:31:22 +0200 Subject: [PATCH] cgal -> cgal_5 if package breaks with cgal v6.0.1 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- pkgs/by-name/ka/kagen/package.nix | 4 ++-- pkgs/by-name/op/openscad/package.nix | 4 ++-- pkgs/by-name/or/orca-slicer/package.nix | 4 ++-- pkgs/development/python-modules/ifcopenshell/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index d7c1343026a6..929b169a254d 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -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 diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix index ec780e878a8f..1b830896ca49 100644 --- a/pkgs/by-name/ka/kagen/package.nix +++ b/pkgs/by-name/ka/kagen/package.nix @@ -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 diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix index 1609c8b42565..5f9b6378b196 100644 --- a/pkgs/by-name/op/openscad/package.nix +++ b/pkgs/by-name/op/openscad/package.nix @@ -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 diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 8f5f53fa3c9e..763b957d7835 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -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 diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index c7129931b7cc..fa6d2b99b5c3 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9cb3198772a..ea1ae4d38951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 572598bac0b4..774efed0bf58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };