From 08975fa8f335d766e376c3efdb3687fefbbd602e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 27 Jan 2023 00:12:38 -0500 Subject: itk: unpin vtk dependency --- pkgs/development/libraries/itk/generic.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 157ae89b7eb..78f4d56bfac 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -1,7 +1,7 @@ { version, rev, sourceSha256 }: { lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }: +, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -53,7 +53,15 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 + # (specifically libGL and libX11 on Linux), + # it's now seemingly necessary for packages that configure ITK to + # also include configuration deps of VTK, even if VTK is not required or available. + # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, + # so we simply propagate them again from ITK. + # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. + propagatedBuildInputs = vtk.propagatedBuildInputs; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" -- cgit 1.4.1