From 99dc5f4ab0e3ddae4bc27150d8f41a1fdb08eca2 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 24 Sep 2017 17:28:16 -0400
Subject: [PATCH] libminc: 2.3.00 -> 2.3.01 (develop branch)

---
 .../development/libraries/libminc/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index 673b572c0899..e133e4be01ce 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, hdf5 }:
+{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-2.3.00";
   pname = "libminc";
+  name  = "${pname}-2.3.01";
 
+  # current master significantly ahead of most recent release
   src = fetchFromGitHub {
-    owner = "BIC-MNI";
-    repo = pname;
-    rev = builtins.replaceStrings [ "." ] [ "-" ] name;
-    sha256 = "1gv1rq1q1brhglll2256cm6sns77ph6fvgbzk3ihkzq46y07yi9s";
+    owner  = "BIC-MNI";
+    repo   = pname;
+    rev    = "e11c6df9321b4061bf87a7d43171ec55e9e3908f";
+    sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ zlib netcdf hdf5 ];
+  buildInputs = [ zlib netcdf nifticlib hdf5 ];
 
-  cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
-                 "-DLIBMINC_MINC1_SUPPORT=ON" ];
+  cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "TRUE" else "FALSE"}"
+                 "-DLIBMINC_MINC1_SUPPORT=TRUE"
+                 "-DLIBMINC_BUILD_SHARED_LIBS=TRUE"
+                 "-DLIBMINC_USE_SYSTEM_NIFTI=TRUE" ];
 
-  checkPhase = "ctest";
+
+  checkPhase = ''
+    export LD_LIBRARY_PATH="$(pwd)"  # see #22060
+    ctest -E ezminc_rw_test --output-on-failure   # ezminc_rw_test can't find libminc_io.so.5.2.0
+  '';
   doCheck = true;
 
   enableParallelBuilding = true;