diff options
| author | Ben Darwin <bcdarwin@gmail.com> | 2019-12-20 12:11:24 -0500 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-10 19:53:25 +0100 |
| commit | bcad453bcfdc85048632054b2b1dfa3077b1953f (patch) | |
| tree | a93edd8f019880612e2cb70962e7d237fc0430c9 /pkgs/applications/science/biology/minc-tools | |
| parent | 6ca7b62a3670d6ebdd6e8ac7f3d531471f1263f8 (diff) | |
minc_tools: 2017-09-11 -> unstable-2019-12-04
Diffstat (limited to 'pkgs/applications/science/biology/minc-tools')
| -rw-r--r-- | pkgs/applications/science/biology/minc-tools/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 033f78609e9ac..87d5ceaa125e7 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -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 ]; diff --git a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch new file mode 100644 index 0000000000000..89c7564f8b626 --- /dev/null +++ b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch @@ -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 */ |