Merge pull request #210392 from bcdarwin/update-elastix

authored by Sandro and committed by GitHub 873acaa0 9bf79ea2

+8 -16
+8 -16
pkgs/development/libraries/science/biology/elastix/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }: 1 + { lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "elastix"; 5 - version = "5.0.1"; 5 + version = "5.1.0"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "SuperElastix"; 9 - repo = pname; 10 - rev = version; 11 - sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; 8 + owner = "SuperElastix"; 9 + repo = pname; 10 + rev = version; 11 + hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; 12 12 }; 13 13 14 - patches = [ 15 - (fetchpatch { 16 - name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 17 - url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; 18 - sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; 19 - }) 20 - ]; 21 - 22 - nativeBuildInputs = [ cmake python3 ]; 23 - buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 14 + nativeBuildInputs = [ cmake ]; 15 + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 24 16 25 17 doCheck = !stdenv.isDarwin; # usual dynamic linker issues 26 18