Skip to content

Commit 658c6aa

Browse files
authored
vtk: 9.2.6 -> 9.5.0 (#417613)
2 parents 69f81dd + 9b61558 commit 658c6aa

11 files changed

Lines changed: 361 additions & 147 deletions

File tree

pkgs/by-name/ex/exhibit/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
3636

3737
dependencies = with python3Packages; [
3838
pygobject3
39-
f3d_egl
39+
f3d
4040
];
4141

4242
dontWrapGApps = true;

pkgs/by-name/f3/f3d/package.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
libXt,
1010
openusd,
1111
tbb,
12-
# There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix
13-
# compiling with EGL enabled vtk will result in f3d running in headless mode
14-
# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later.
15-
vtk_9,
12+
vtk,
1613
autoPatchelfHook,
1714
python3Packages,
1815
opencascade-occt,
@@ -50,7 +47,7 @@ stdenv.mkDerivation rec {
5047
];
5148

5249
buildInputs = [
53-
vtk_9
50+
vtk
5451
opencascade-occt
5552
assimp
5653
fontconfig

pkgs/development/libraries/vtk/9.x.nix

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
callPackage,
3+
fetchpatch2,
4+
}:
5+
let
6+
mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { };
7+
in
8+
{
9+
vtk_9_5 = mkVtk {
10+
version = "9.5.0";
11+
sourceSha256 = "sha256-BK6GJGuVV8a2GvvFNKbfCZJE+8jzk3+C5rwFcJU6+H0=";
12+
patches = [
13+
# https://gitlab.kitware.com/vtk/vtk/-/issues/19699
14+
(fetchpatch2 {
15+
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/6b4f7b853675c63e4831c366ca8f78e320c1bfb5.diff";
16+
hash = "sha256-hWJc5RxW6iK+W/rTxp2GUWKcm/2+oxbP5nVZ0EUSKHE=";
17+
})
18+
# https://gitlab.kitware.com/vtk/vtk/-/issues/19705
19+
(fetchpatch2 {
20+
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/ce10dfe82ffa19c8108885625a6f8b3f980bed3b.diff";
21+
hash = "sha256-kyPM0whL4WeaV27sNM1fbbs5kwMYn+9E561HtvnwHRc=";
22+
})
23+
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/12262
24+
(fetchpatch2 {
25+
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/c0e0f793e6adf740f5b1c91ac330afdbc2a03b72.diff";
26+
hash = "sha256-BinSv8sPqpAEcgkn8trnCPv2snR9MGcA8rkVflAhc5w=";
27+
})
28+
];
29+
};
30+
}

0 commit comments

Comments
 (0)