about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliButz <WilliButz@users.noreply.github.com>2019-09-13 14:25:41 +0200
committerGitHub <noreply@github.com>2019-09-13 14:25:41 +0200
commita9f555d393fc493398190cec06c331090d3a3c4a (patch)
tree46bb501ec943e1a031b729ca5768e86547e6993f
parentfaada6275d880a732d7a6b5a8cdda1b55fa051e2 (diff)
parentf6182da2c6fb089cc8723e3f0a1c88be65112db9 (diff)
downloadnixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar.gz
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar.bz2
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar.lz
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar.xz
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.tar.zst
nixlib-a9f555d393fc493398190cec06c331090d3a3c4a.zip
Merge pull request #68643 from NixOS/fix-ants
ants: fix build
-rw-r--r--pkgs/applications/science/biology/ants/default.nix11
-rw-r--r--pkgs/development/libraries/itk/4.x.nix34
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 41 insertions, 6 deletions
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index 834d2497e8df..6e1a2a3407ee 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk, vtk }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk }:
 
 stdenv.mkDerivation rec {
-  _name    = "ANTs";
-  _version = "2.2.0";
-  name  = "${_name}-${_version}";
+  pname    = "ANTs";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner  = "ANTsX";
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake makeWrapper ];
-  buildInputs = [ itk vtk ];
+  buildInputs = [ itk4 vtk ];
 
   cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
 
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/ANTxS/ANTs;
+    homepage = https://github.com/ANTsX/ANTs;
     description = "Advanced normalization toolkit for medical image registration and other processing";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix
new file mode 100644
index 000000000000..df016d9fcac0
--- /dev/null
+++ b/pkgs/development/libraries/itk/4.x.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
+
+stdenv.mkDerivation rec {
+  name = "itk-4.13.1";
+
+  src = fetchurl {
+    url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz;
+    sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al";
+  };
+
+  cmakeFlags = [
+    "-DBUILD_TESTING=OFF"
+    "-DBUILD_EXAMPLES=OFF"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DModule_ITKMINC=ON"
+    "-DModule_ITKIOMINC=ON"
+    "-DModule_ITKIOTransformMINC=ON"
+    "-DModule_ITKVtkGlue=ON"
+    "-DModule_ITKReview=ON"
+  ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ cmake xz ];
+  buildInputs = [ libX11 libuuid vtk ];
+
+  meta = {
+    description = "Insight Segmentation and Registration Toolkit";
+    homepage = http://www.itk.org/;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 406b42f498de..a315698ccd95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11412,6 +11412,8 @@ in
 
   isso = callPackage ../servers/isso { };
 
+  itk4 = callPackage ../development/libraries/itk/4.x.nix { };
+
   itk = callPackage ../development/libraries/itk { };
 
   jasper = callPackage ../development/libraries/jasper { };