Merge pull request from bcdarwin/update-c3d

c3d: unstable-2020-10-05 -> unstable-2021-09-14
This commit is contained in:
Mario Rodas 2021-11-16 00:02:01 -05:00 committed by GitHub
commit 975624d954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,20 +1,22 @@
{ lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: { lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "c3d"; pname = "c3d";
version = "unstable-2020-10-05"; version = "unstable-2021-09-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pyushkevich"; owner = "pyushkevich";
repo = pname; repo = pname;
rev = "0a87e3972ea403babbe2d05ec6d50855e7c06465"; rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388";
sha256 = "0wsmkifqrcfy13fnwvinmnq1m0lkqmpyg7bgbwnb37mbrlbq06wf"; sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ itk4 ] buildInputs = [ itk ]
++ lib.optional stdenv.isDarwin Cocoa; ++ lib.optional stdenv.isDarwin Cocoa;
cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/pyushkevich/c3d"; homepage = "https://github.com/pyushkevich/c3d";
description = "Medical imaging processing tool"; description = "Medical imaging processing tool";
@ -22,6 +24,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl3; license = licenses.gpl3;
broken = stdenv.isAarch64; broken = stdenv.isAarch64;
# /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory
}; };
} }