From 5c74fb32993ae39a517ad38c9301d8fb90332cda Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 5 Mar 2026 06:32:38 +0800 Subject: [PATCH] vtk_9_6: init at 9.6.0 --- pkgs/development/libraries/vtk/default.nix | 5 +++++ pkgs/development/libraries/vtk/generic.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 43a54152f3da..4c701d85148a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -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="; + }; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 4ee650fb3a38..1fb35db46b36 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9c3acb8a819..a22ad4b3a1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;