public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minc_tools: unstable-2019-12-04 -> unstable-2020-07-25

Browse Source
This commit is contained in:
Ben Darwin 2020-07-22 15:43:03 -04:00
parent 3862e92e01
commit 91a429a148
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/science/biology/minc-tools/default.nix
View File

@ -3,28 +3,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minc-tools"; pname = "minc-tools";
version = "unstable-2019-12-04"; version = "unstable-2020-07-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BIC-MNI"; owner = "BIC-MNI";
repo = pname; repo = pname;
rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94"; rev = "fb0a68a07d281e4e099c5d54df29925240de14c1";
sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng"; sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw";
}; };
patches = [ ./fix-netcdf-header.patch ];
# add missing CMake module to build NIFTI support
# (the maintainers normally build libminc and minc-tools in a meta-project)
postPatch = ''
cp ${libminc.src}/cmake-modules/FindNIFTI.cmake cmake-modules
'';
nativeBuildInputs = [ cmake flex bison makeWrapper ]; nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ libminc libjpeg nifticlib zlib ]; buildInputs = [ libminc libjpeg nifticlib zlib ];
propagatedBuildInputs = [ perl TextFormat ]; propagatedBuildInputs = [ perl TextFormat ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
"-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti"
"-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ];

12
pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch
View File

@ -1,12 +0,0 @@
diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h
index 14c95cd..117ab26 100644
--- a/progs/mincdump/mincdump.h
+++ b/progs/mincdump/mincdump.h
@@ -3,6 +3,7 @@
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $
*********************************************************************/
+#include <netcdf_meta.h>
/* error checking macro */