itk4: 4.13.2 -> 4.13.3

This commit is contained in:
Ben Darwin 2020-08-03 19:08:57 -04:00 committed by Alyssa Ross
parent bf48f0f535
commit 9b589c7c9a
2 changed files with 15 additions and 14 deletions

View File

@ -1,11 +1,14 @@
{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk_7 }:
{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk_7, Cocoa }:
stdenv.mkDerivation rec {
name = "itk-4.13.2";
pname = "itk";
version = "4.13.3";
src = fetchurl {
url = "mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz";
sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns";
src = fetchFromGitHub {
owner = "InsightSoftwareConsortium";
repo = "ITK";
rev = "v${version}";
sha256 = "067vkh39jxcvyvn69qjh4vi3wa7vdvm9m6qsg3jmnmm7gzw0kjlm";
};
cmakeFlags = [
@ -22,11 +25,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ cmake xz ];
buildInputs = [ libX11 libuuid vtk_7 ];
buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
meta = {
description = "Insight Segmentation and Registration Toolkit";
homepage = "http://www.itk.org/";
homepage = "https://www.itk.org/";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux ++ darwin;

View File

@ -1442,7 +1442,6 @@ in
bs-platform = callPackage ../development/compilers/bs-platform {};
c3d = callPackage ../applications/graphics/c3d {
stdenv = gcc8Stdenv;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -12797,7 +12796,9 @@ in
isso = callPackage ../servers/isso { };
itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; };
itk4 = callPackage ../development/libraries/itk/4.x.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
itk = callPackage ../development/libraries/itk {
inherit (darwin.apple_sdk.frameworks) Cocoa;
@ -15000,7 +15001,6 @@ in
simpleitk = callPackage ../development/libraries/simpleitk {
lua = lua51Packages.lua;
stdenv = gcc8Stdenv;
};
sfml = callPackage ../development/libraries/sfml {
@ -25190,9 +25190,7 @@ in
alliance = callPackage ../applications/science/electronics/alliance { };
ants = callPackage ../applications/science/biology/ants {
stdenv = gcc8Stdenv;
};
ants = callPackage ../applications/science/biology/ants { };
aragorn = callPackage ../applications/science/biology/aragorn { };
@ -25246,7 +25244,7 @@ in
est-sfs = callPackage ../applications/science/biology/est-sfs { };
ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; };
ezminc = callPackage ../applications/science/biology/EZminc { };
exonerate = callPackage ../applications/science/biology/exonerate { };