summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2023-01-27 00:12:38 -0500
committerBen Darwin <bcdarwin@gmail.com>2023-01-27 00:21:21 -0500
commit08975fa8f335d766e376c3efdb3687fefbbd602e (patch)
tree984a51f1dfa8bcb9a6594c675b32f43c714224b3
parent5640418357f789d0579e56b2a295691718ad56f7 (diff)
downloadnixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar.gz
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar.bz2
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar.lz
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar.xz
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.tar.zst
nixpkgs-08975fa8f335d766e376c3efdb3687fefbbd602e.zip
itk: unpin vtk dependency
-rw-r--r--pkgs/development/libraries/itk/generic.nix12
1 files 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"