vtk: fix build with gdal-3.13; vtk_9_6: 9.6.0 -> 9.6.2; python3Packages.vtk: drop wslink; vtk: propagate qttools; (#537721)

pkgs/by-name/pa/parmmg/package.nix

@@ -10,10 +10,13 @@
   metis,
   mmg,
   scotch,
-  vtk-full,
+  vtk,
   withVtk ? true,
   testers,
 }:
+let
+  vtk-mpi = vtk.override { mpiSupport = true; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "parmmg";
   version = "1.5.0";
@@ -53,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
     scotch
     (mmg.override {
       inherit withVtk;
-      vtk = vtk-full;
+      vtk = vtk-mpi;
     })
   ]
-  ++ lib.optional withVtk vtk-full;
+  ++ lib.optional withVtk vtk-mpi;
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))

pkgs/development/libraries/vtk/default.nix

@@ -1,6 +1,6 @@
 {
   callPackage,
-  fetchpatch2,
+  fetchpatch,
 }:
 let
   mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { };
@@ -9,10 +9,24 @@ in
   vtk_9_5 = mkVtk {
     version = "9.5.2";
     sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk=";
+    patches = [
+      (fetchpatch {
+        name = "fix-gdal-3.13-const-conversion.patch";
+        url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch";
+        hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I=";
+      })
+    ];
   };
 
   vtk_9_6 = mkVtk {
-    version = "9.6.0";
-    sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI=";
+    version = "9.6.2";
+    sourceSha256 = "sha256-rtEs7BKpYJF5v2YykHAmZifKZCRKEIVqRSsqF/+wSh0=";
+    patches = [
+      (fetchpatch {
+        name = "fix-gdal-3.13-const-conversion.patch";
+        url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch";
+        hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I=";
+      })
+    ];
   };
 }

pkgs/development/libraries/vtk/generic.nix

@@ -169,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxrender
     libxcursor
   ]
-  ++ lib.optional withQt6 qt6.qttools
   ++ lib.optional mpiSupport mpi
   ++ lib.optional pythonSupport tk;
 
@@ -219,6 +218,10 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     gl2ps
   ]
+  ++ lib.optionals ((lib.versionAtLeast finalAttrs.version "9.6.0") && stdenv.hostPlatform.isLinux) [
+    libxcursor
+  ]
+  ++ lib.optionals withQt6 [ qt6.qttools ]
   # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do
   ++ lib.optionals pythonSupport [
     (python3Packages.mkPythonMetaPackage {
@@ -227,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: {
         with python3Packages;
         [
           numpy
-          wslink
           matplotlib
         ]
         ++ lib.optional mpiSupport (mpi4py.override { inherit mpi; });
@@ -320,7 +322,6 @@ stdenv.mkDerivation (finalAttrs: {
         package = finalAttrs.finalPackage;
 
         nativeBuildInputs = lib.optionals withQt6 [
-          qt6.qttools
           qt6.wrapQtAppsHook
         ];
       };