diff options
author | Ben Darwin <bcdarwin@gmail.com> | 2017-09-24 18:06:00 -0400 |
---|---|---|
committer | Ben Darwin <bcdarwin@gmail.com> | 2018-04-09 18:06:33 -0400 |
commit | 082b3f1058458713bd56ea096de16f243cb47f32 (patch) | |
tree | cfd2442acdeaa32fccbf656c8665ea2a49557365 /pkgs/applications/science/biology | |
parent | fa2cc0e72fc3e978b6132904d2adb2f3005d15d9 (diff) | |
download | nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar.gz nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar.bz2 nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar.lz nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar.xz nixlib-082b3f1058458713bd56ea096de16f243cb47f32.tar.zst nixlib-082b3f1058458713bd56ea096de16f243cb47f32.zip |
minc-tools: 2.3.00 -> 2.3.01 (develop branch)
Diffstat (limited to 'pkgs/applications/science/biology')
-rw-r--r-- | pkgs/applications/science/biology/minc-tools/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 7864658c9582..011db3f0fb86 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, perl, cmake, flex, bison, libminc }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, libminc, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "${pname}-2.3.00"; pname = "minc-tools"; + name = "${pname}-2.3.01"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = builtins.replaceStrings [ "." ] [ "-" ] name; - sha256 = "0px5paprx4ds9aln3jdg1pywszgyz2aykgkdbj1y8gc1lwcizsl9"; + owner = "BIC-MNI"; + repo = pname; + rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056"; + sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7"; }; - nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]); - buildInputs = [ libminc ]; + nativeBuildInputs = [ cmake flex bison makeWrapper ]; + buildInputs = [ libminc libjpeg zlib ]; + propagatedBuildInputs = [ perl TextFormat ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; - checkPhase = "ctest"; - doCheck = false; + checkPhase = "ctest --output-on-failure"; # still some weird test failures though + + postFixup = '' + for prog in minccomplete minchistory mincpik; do + wrapProgram $out/bin/$prog --prefix PERL5LIB : $PERL5LIB + done + ''; enableParallelBuilding = true; |