colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212901 from bcdarwin/itk-ants-unpin-vtk

Browse Source 
itk, ants: unpin vtk
This commit is contained in:
Weijia Wang 2023-01-28 03:24:41 +01:00 committed by GitHub
commit 61c6a19154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/biology/ants/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }:
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }:
stdenv.mkDerivation rec {
pname = "ANTs";
pname = "ANTs";
version = "2.4.3";
src = fetchFromGitHub {
owner = "ANTsX";
repo = "ANTs";
rev = "v${version}";
rev = "refs/tags/v${version}";
sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g=";
};
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

12
pkgs/development/libraries/itk/generic.nix
View File

@ -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"