Unverified Commit a6207181 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #259647 from bcdarwin/simpleitk-improvements 

simpleitk: improvements and enable SimpleElastix cmake module
parents 07ed0f8b 9c90eb4e

pkgs/development/libraries/simpleitk/default.nix

+27 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }:

{ lib

, stdenv

, fetchFromGitHub

, cmake

, swig4

, lua

, elastix

, itk

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "simpleitk";

  version = "2.3.0";



  src = fetchFromGitHub {

    owner = "SimpleITK";

    repo = "SimpleITK";

    rev = "refs/tags/v${version}";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-SJSFJEFu1qKowX5/98MslN7GFDS8aF5+EKkQ2983Azg=";

  };



  nativeBuildInputs = [ cmake swig4 ];

  buildInputs = [ lua itk ];

  nativeBuildInputs = [

    cmake

    swig4

  ];

  buildInputs = [

    elastix

    lua

    itk

  ];



  # 2.0.0: linker error building examples

  cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];

  cmakeFlags = [

    "-DBUILD_EXAMPLES=OFF"

    "-DBUILD_SHARED_LIBS=OFF"

    "-DSimpleITK_USE_ELASTIX=ON"

  ];



  meta = with lib; {

    homepage = "https://www.simpleitk.org";

    description = "Simplified interface to ITK";

    changelog = "https://github.com/SimpleITK/SimpleITK/releases/tag/v${finalAttrs.version}";

    maintainers = with maintainers; [ bcdarwin ];

    platforms = platforms.linux;

    license = licenses.asl20;

  };

}
 
})

pkgs/development/python-modules/simpleitk/default.nix

+12 −2
Original line number Diff line number Diff line
@@ -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" ];

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -24997,7 +24997,7 @@ with pkgs; 














  simp_le = callPackage ../tools/admin/simp_le { };



























  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; };













  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };





























  sioclient = callPackage ../development/libraries/sioclient { };