cgal: default to version 5
This commit is contained in:
committed by
Bjørn Forsman
parent
6ae8bce49d
commit
1791eeb7bd
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, boost
|
||||
, eigen
|
||||
, gmp
|
||||
, cgal_5 # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal
|
||||
, cgal # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal
|
||||
, mpfr
|
||||
, tbb
|
||||
, numpy
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
patches = [ ./remove_explicit_PYTHONPATH.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib ];
|
||||
buildInputs = [ boost eigen gmp cgal_5 mpfr ]
|
||||
buildInputs = [ boost eigen gmp cgal mpfr ]
|
||||
++ lib.optionals enableTBB [ tbb ];
|
||||
propagatedBuildInputs = [ numpy scipy ];
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
||||
@@ -20818,7 +20818,7 @@ with pkgs;
|
||||
# CGAL 5 has API changes
|
||||
cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
|
||||
cgal_5 = callPackage ../development/libraries/CGAL { };
|
||||
cgal = cgal_4;
|
||||
cgal = cgal_5;
|
||||
|
||||
cgui = callPackage ../development/libraries/cgui { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user