about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2020-02-07 11:57:12 -0500
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-02-10 19:53:25 +0100
commit39f0e3b32b5b4aa5ec463c21fa3488f677fac18e (patch)
tree9088bfabed12d079591247ebc93219d05c692524
parentbcad453bcfdc85048632054b2b1dfa3077b1953f (diff)
downloadnixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar.gz
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar.bz2
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar.lz
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar.xz
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.tar.zst
nixlib-39f0e3b32b5b4aa5ec463c21fa3488f677fac18e.zip
minc_tools: enable building conversion tools
-rw-r--r--pkgs/applications/science/biology/minc-tools/default.nix11
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 87d5ceaa125e..4c8b768a56a9 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }:
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat,
+  libminc, libjpeg, nifticlib, zlib }:
 
 stdenv.mkDerivation rec {
   pname   = "minc-tools";
@@ -15,9 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake flex bison makeWrapper ];
   buildInputs = [ libminc libjpeg zlib ];
-  propagatedBuildInputs = with perlPackages; [ perl TextFormat ];
+  propagatedBuildInputs = [ perl TextFormat ];
 
-  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
+                 "-DZNZ_INCLUDE_DIR=${nifticlib}/include/"
+                 "-DZNZ_LIBRARY=${nifticlib}/lib/libznz.a"
+                 "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti/"
+                 "-DNIFTI_LIBRARY=${nifticlib}/lib/libniftiio.a" ];
 
   postFixup = ''
     for prog in minccomplete minchistory mincpik; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b325f77a87af..85891e27c516 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23884,7 +23884,9 @@ in
 
   messer-slim = callPackage ../applications/science/biology/messer-slim { };
 
-  minc_tools = callPackage ../applications/science/biology/minc-tools { };
+  minc_tools = callPackage ../applications/science/biology/minc-tools {
+    inherit (perlPackages) perl TextFormat;
+  };
 
   minc_widgets = callPackage ../applications/science/biology/minc-widgets { };