summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-12-01 10:27:11 +0000
committerGitHub <noreply@github.com>2021-12-01 10:27:11 +0000
commite89d789748cf3094e22e56e6abd986ebe7739c61 (patch)
tree765ae36fed479c367e73f20b5c8ac0c28b905ce6 /pkgs
parentc64e26628b8b2cc958fe5cfad66c49f44473f8e3 (diff)
parentb1d95dca5645c107f49873ad5ab08e6d01c416cf (diff)
downloadnixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar.gz
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar.bz2
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar.lz
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar.xz
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.tar.zst
nixpkgs-e89d789748cf3094e22e56e6abd986ebe7739c61.zip
Merge pull request #148096 from arkivm/fix-mrtrix
mrtrix: 3.0.2 -> unstable-2021-11-25
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/science/biology/mrtrix/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
index e0b122778d1..10bfb633f4a 100644
--- a/pkgs/applications/science/biology/mrtrix/default.nix
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -1,17 +1,17 @@
 { stdenv, lib, fetchFromGitHub, python, makeWrapper
 , eigen, fftw, libtiff, libpng, zlib, ants, bc
 , qt5, libGL, libGLU, libX11, libXext
-, withGui ? true }:
+, withGui ? true, less }:
 
 stdenv.mkDerivation rec {
   pname = "mrtrix";
-  version = "3.0.2";
+  version = "unstable-2021-11-25";
 
   src = fetchFromGitHub {
     owner  = "MRtrix3";
     repo   = "mrtrix3";
-    rev    = version;
-    sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3";
+    rev    = "994498557037c9e4f7ba67f255820ef84ea899d9";
+    sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8=";
     fetchSubmodules = true;
   };
 
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
 
     substituteInPlace ./run_tests  \
       --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
+
+    substituteInPlace ./build  \
+      --replace '"less -RX "' '"${less}/bin/less -RX "'
   '';
 
   configurePhase = ''