alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

itk: unstable -> 5.3.0

Browse source
This commit is contained in:
Ben Darwin 2022-12-20 15:44:42 -05:00 committed by Rick van Schijndel
parent b4eb020143
commit 9c748218f2
9 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/c3d/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: { lib, stdenv, fetchFromGitHub, cmake, itk_5_2, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "c3d"; pname = "c3d";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ itk ] buildInputs = [ itk_5_2 ]
++ lib.optional stdenv.isDarwin Cocoa; ++ lib.optional stdenv.isDarwin Cocoa;
cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ];

4
pkgs/applications/science/biology/ants/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }: { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ANTs"; pname = "ANTs";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

5
pkgs/development/libraries/itk/5.2.x.nix Normal file
View file

@ -0,0 +1,5 @@
import ./generic.nix rec {
version = "5.2.1";
rev = "v${version}";
sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE=";
}

4
pkgs/development/libraries/itk/5.x.nix
View file

@ -1,5 +1,5 @@
import ./generic.nix rec { import ./generic.nix rec {
version = "5.2.1"; version = "5.3.0";
rev = "v${version}"; rev = "v${version}";
sourceSha256 = "sha256-KaVe9FMGm4ZVMpwAT12fA67T0qZS3ZueiI8z85+xSwE="; sourceSha256 = "sha256-+qCd8Jzpl5fEPTUpLyjjFBkfgCn3+Lf4pi8QnjCwofs=";
} }

2
pkgs/development/libraries/itk/generic.nix
View file

@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \
--replace "-march=corei7" "" \ --replace "-march=corei7" "" \
--replace "-mtune=native" "" --replace "-mtune=native" ""
substituteInPlace Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in \
--replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@"
ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator
ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising
''; '';

5
pkgs/development/libraries/itk/unstable.nix
View file

@ -1,5 +0,0 @@
import ./generic.nix {
version = "unstable-2022-07-02";
rev = "5e7aea957c82b67d4364b2b88999805616e3b01d";
sourceSha256 = "sha256-tjkoaHCuVdvgE6X+7Kb8mt9oxINWs4R0xD9cxdEeYKk=";
}

4
pkgs/development/libraries/science/biology/elastix/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elastix"; pname = "elastix";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];
buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
doCheck = !stdenv.isDarwin; # usual dynamic linker issues doCheck = !stdenv.isDarwin; # usual dynamic linker issues

4
pkgs/development/libraries/simpleitk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: { lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk_5_2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "simpleitk"; pname = "simpleitk";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake swig4 ]; nativeBuildInputs = [ cmake swig4 ];
buildInputs = [ lua itk ]; buildInputs = [ lua itk_5_2 ];
# 2.0.0: linker error building examples # 2.0.0: linker error building examples
cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];

4
pkgs/top-level/all-packages.nix
View file

@ -20065,11 +20065,11 @@ with pkgs;
nodejs = nodejs-14_x; nodejs = nodejs-14_x;
}; };
itk_5 = callPackage ../development/libraries/itk/5.x.nix { itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
itk-unstable = callPackage ../development/libraries/itk/unstable.nix { itk_5 = callPackage ../development/libraries/itk/5.x.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };