itk: unpin vtk dependency
This commit is contained in:
parent
5640418357
commit
08975fa8f3
|
@ -1,7 +1,7 @@
|
||||||
{ version, rev, sourceSha256 }:
|
{ version, rev, sourceSha256 }:
|
||||||
|
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
|
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
|
||||||
, pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }:
|
, pkg-config, libX11, libuuid, xz, vtk, Cocoa }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "itk";
|
pname = "itk";
|
||||||
|
@ -53,7 +53,15 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake xz makeWrapper ];
|
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 = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
|
wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
|
||||||
|
|
Loading…
Reference in a new issue