From 9c90eb4e3f660d298900169f8fe2da914075cf8d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 7 Oct 2023 18:30:08 -0400 Subject: [PATCH] simpleitk: enable SimpleElastix module Note that building SimpleITK with shared libraries had to be disabled when building against Elastix (which doesn't support building with shared libraries for some reason) due to a linker error. However, the Python package correctly builds the needed shared objects. --- pkgs/development/libraries/simpleitk/default.nix | 5 ++++- .../python-modules/simpleitk/default.nix | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index c2f75bdd6c26..8ef0e5e39a55 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -4,6 +4,7 @@ , cmake , swig4 , lua +, elastix , itk }: @@ -23,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: { swig4 ]; buildInputs = [ + elastix lua itk ]; @@ -30,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: { # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" - "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-DSimpleITK_USE_ELASTIX=ON" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index aa8a970364d8..e07e6e994d43 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , swig4 +, elastix , itk , numpy , simpleitk @@ -20,8 +21,17 @@ buildPythonPackage rec { make ''; - nativeBuildInputs = [ cmake swig4 scikit-build ]; - propagatedBuildInputs = [ itk simpleitk numpy ]; + nativeBuildInputs = [ + cmake + swig4 + scikit-build + ]; + propagatedBuildInputs = [ + elastix + itk + simpleitk + numpy + ]; pythonImportsCheck = [ "SimpleITK" ]; }