Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/by-name/ex/exhibit/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {

dependencies = with python3Packages; [
pygobject3
f3d_egl
f3d
];

dontWrapGApps = true;
Expand Down
7 changes: 2 additions & 5 deletions pkgs/by-name/f3/f3d/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
libXt,
openusd,
tbb,
# There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix
# compiling with EGL enabled vtk will result in f3d running in headless mode
# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later.
vtk_9,
vtk,
autoPatchelfHook,
python3Packages,
opencascade-occt,
Expand Down Expand Up @@ -50,7 +47,7 @@ stdenv.mkDerivation rec {
];

buildInputs = [
vtk_9
vtk
opencascade-occt
assimp
fontconfig
Expand Down
5 changes: 0 additions & 5 deletions pkgs/development/libraries/vtk/9.x.nix

This file was deleted.

30 changes: 30 additions & 0 deletions pkgs/development/libraries/vtk/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
callPackage,
fetchpatch2,
}:
let
mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this split actually necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, neccessary to keep multi vtk instance.
some downstream packages (e.g. gdcm) may react slow to vtk api change. While some (e.g. paraview) want's the latest vtk version.

in
{
vtk_9_5 = mkVtk {
version = "9.5.0";
sourceSha256 = "sha256-BK6GJGuVV8a2GvvFNKbfCZJE+8jzk3+C5rwFcJU6+H0=";
patches = [
# https://gitlab.kitware.com/vtk/vtk/-/issues/19699
(fetchpatch2 {
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/6b4f7b853675c63e4831c366ca8f78e320c1bfb5.diff";
hash = "sha256-hWJc5RxW6iK+W/rTxp2GUWKcm/2+oxbP5nVZ0EUSKHE=";
})
# https://gitlab.kitware.com/vtk/vtk/-/issues/19705
(fetchpatch2 {
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/ce10dfe82ffa19c8108885625a6f8b3f980bed3b.diff";
hash = "sha256-kyPM0whL4WeaV27sNM1fbbs5kwMYn+9E561HtvnwHRc=";
})
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/12262
(fetchpatch2 {
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/c0e0f793e6adf740f5b1c91ac330afdbc2a03b72.diff";
hash = "sha256-BinSv8sPqpAEcgkn8trnCPv2snR9MGcA8rkVflAhc5w=";
})
];
};
}
Loading
Loading