minc_tools: 2017-09-11 -> unstable-2019-12-04

This commit is contained in:
Ben Darwin 2019-12-20 12:11:24 -05:00 committed by Frederik Rietdijk
parent 6ca7b62a36
commit bcad453bcf
2 changed files with 18 additions and 4 deletions

View File

@ -1,16 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }:
stdenv.mkDerivation rec {
pname = "minc-tools";
name = "${pname}-2017-09-11";
pname = "minc-tools";
version = "unstable-2019-12-04";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056";
sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7";
rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94";
sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng";
};
patches = [ ./fix-netcdf-header.patch ];
nativeBuildInputs = [ cmake flex bison makeWrapper ];
buildInputs = [ libminc libjpeg zlib ];
propagatedBuildInputs = with perlPackages; [ perl TextFormat ];

View File

@ -0,0 +1,12 @@
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 */