Commit 5c74fb32 authored by qbisi's avatar qbisi
Browse files

vtk_9_6: init at 9.6.0

parent 6fb9bc96
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -10,4 +10,9 @@ in
    version = "9.5.2";
    sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk=";
  };

  vtk_9_6 = mkVtk {
    version = "9.6.0";
    sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI=";
  };
}
+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@
  # filters
  openturns,
  openslide,
  onnxruntime,

  # io modules
  cgns,
@@ -65,6 +66,7 @@
  hdf5,
  netcdf,
  opencascade-occt,
  openusd,

  # threading
  onetbb,
@@ -113,6 +115,9 @@ let
    viskores = self.callPackage viskores.override { };
    gdal = self.callPackage gdal.override { useMinimalFeatures = true; };
    pdal = self.callPackage pdal.override { };
    # vtk fail to configure with openusd with materialX support
    # see https://github.com/AcademySoftwareFoundation/MaterialX/pull/2752
    openusd = openusd.override { withMaterialX = false; };
  });
  vtkBool = feature: bool: lib.cmakeFeature feature "${if bool then "YES" else "NO"}";
in
@@ -155,6 +160,10 @@ stdenv.mkDerivation (finalAttrs: {
    vtkPackages.gdal
    vtkPackages.pdal
  ]
  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "9.6.0") [
    vtkPackages.openusd
    onnxruntime
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    libxfixes
    libxrender
@@ -169,7 +178,11 @@ stdenv.mkDerivation (finalAttrs: {
    eigen
    boost
    verdict
  ]
  ++ lib.optionals (lib.versionOlder finalAttrs.version "9.6.0") [
    double-conversion
  ]
  ++ [
    freetype
    lz4
    xz
+1 −1
Original line number Diff line number Diff line
@@ -7641,7 +7641,7 @@ with pkgs;
    gtkVersion = "4";
  };

  inherit (callPackage ../development/libraries/vtk { }) vtk_9_5;
  inherit (callPackage ../development/libraries/vtk { }) vtk_9_5 vtk_9_6;

  vtk = vtk_9_5;