Merge pull request #236810 from natsukium/cmtk/update

cmtk: 3.3.1 -> 3.3.2; fix darwin build

authored by

Mario Rodas and committed by
GitHub
156a49aa a4c9b33c

+27 -11
+27 -11
pkgs/applications/science/biology/cmtk/default.nix
··· 1 - { lib, stdenv, fetchurl, cmake }: 1 + { lib 2 + , stdenv 3 + , bzip2 4 + , cmake 5 + , fetchurl 6 + , fftw 7 + , llvmPackages 8 + , zlib 9 + }: 2 10 3 - stdenv.mkDerivation rec { 11 + stdenv.mkDerivation (finalAttrs: { 4 12 pname = "cmtk"; 5 - version = "3.3.1"; 13 + version = "3.3.2"; 6 14 7 15 src = fetchurl { 8 16 name = "cmtk-source.tar.gz"; 9 - url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1"; 10 - sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; 17 + url = "https://www.nitrc.org/frs/download.php/13188/CMTK-${finalAttrs.version}-Source.tar.gz//?i_agree=1&download_now=1"; 18 + hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4="; 11 19 }; 12 20 13 21 nativeBuildInputs = [ cmake ]; 14 22 23 + buildInputs = [ 24 + bzip2 25 + fftw 26 + zlib 27 + ] ++ lib.optionals stdenv.cc.isClang [ 28 + llvmPackages.openmp 29 + ]; 30 + 15 31 env.NIX_CFLAGS_COMPILE = toString [ 16 - "-std=c++11" 17 - (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") 32 + (lib.optionalString stdenv.cc.isGNU "-std=c++11") 33 + (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") 34 + (lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite") 18 35 ]; 19 36 20 37 meta = with lib; { 21 - broken = stdenv.isDarwin; 22 - description = "Computational Morphometry Toolkit "; 38 + description = "Computational Morphometry Toolkit"; 23 39 longDescription = ''A software toolkit for computational morphometry of 24 40 biomedical images, CMTK comprises a set of command line tools and a 25 41 back-end general-purpose library for processing and I/O''; 26 42 maintainers = with maintainers; [ tbenst ]; 27 43 platforms = platforms.all; 28 - license = licenses.gpl3; 44 + license = licenses.gpl3Plus; 29 45 homepage = "https://www.nitrc.org/projects/cmtk/"; 30 46 }; 31 - } 47 + })