From 656a07eafd00a3081cfb112daefc5a932e19ea0a Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 16 Jul 2026 20:00:15 +0800 Subject: [PATCH 1/5] vtk: fix build with gdal-3.13 --- pkgs/development/libraries/vtk/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 4c701d85148a..90f65eb6b358 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/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="; + patches = [ + (fetchpatch { + name = "fix-gdal-3.13-const-conversion.patch"; + url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch"; + hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I="; + }) + ]; }; } From c1987d2d9132443be6e18d27e288306e0295e638 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 2 Jul 2026 16:06:11 +0800 Subject: [PATCH 2/5] vtk_9_6: 9.6.0 -> 9.6.2 --- pkgs/development/libraries/vtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 90f65eb6b358..6f846c8eedca 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -19,8 +19,8 @@ in }; 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"; From c7e1afd8ef452cdb7e4c237ad9cdb228272384ad Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 16 Jul 2026 19:43:57 +0800 Subject: [PATCH 3/5] python3Packages.vtk: drop wslink dependency wslink is an optional dependency of vtk. See also https://github.com/Kitware/wslink/pull/165#issuecomment-3769609059. --- pkgs/development/libraries/vtk/generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 2c55cb56a380..536499f718aa 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -227,7 +227,6 @@ stdenv.mkDerivation (finalAttrs: { with python3Packages; [ numpy - wslink matplotlib ] ++ lib.optional mpiSupport (mpi4py.override { inherit mpi; }); From 795a776aac5c6b33ac910693880f6b5287594817 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 2 Jul 2026 16:13:07 +0800 Subject: [PATCH 4/5] vtk: propagate qttools --- pkgs/by-name/pa/parmmg/package.nix | 9 ++++++--- pkgs/development/libraries/vtk/generic.nix | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix index 0d1681c04f2c..9623b341eb53 100644 --- a/pkgs/by-name/pa/parmmg/package.nix +++ b/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)) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 536499f718aa..b09439d68196 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/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,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 gl2ps ] + ++ 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 { @@ -319,7 +319,6 @@ stdenv.mkDerivation (finalAttrs: { package = finalAttrs.finalPackage; nativeBuildInputs = lib.optionals withQt6 [ - qt6.qttools qt6.wrapQtAppsHook ]; }; From 94cccf0fcd834b3c38a5eb6dca40201ef1a85c40 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 16 Jul 2026 20:07:32 +0800 Subject: [PATCH 5/5] vtk_9_6: propagate libxcursor libxcursor is publicly referenced in vtkX11Functions.h. See also https://github.com/NixOS/nixpkgs/pull/501661#issuecomment-4102231881. --- pkgs/development/libraries/vtk/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index b09439d68196..0028af291ca3 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -218,6 +218,9 @@ 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 [