Merge pull request #37101 from xeji/p/itk
itk: 4.11.0 -> 4.12.2, fix build
This commit is contained in:
commit
593e71889f
|
@ -1,20 +1,13 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
|
{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "itk-4.11.0";
|
name = "itk-4.12.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
|
url = mirror://sourceforge/itk/InsightToolkit-4.12.2.tar.xz;
|
||||||
sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
|
sha256 = "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be
|
|
||||||
# necessary once we get past ITK 4.11.
|
|
||||||
patches = [ (fetchpatch {
|
|
||||||
url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch";
|
|
||||||
sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s";
|
|
||||||
}) ];
|
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DBUILD_TESTING=OFF"
|
"-DBUILD_TESTING=OFF"
|
||||||
"-DBUILD_EXAMPLES=OFF"
|
"-DBUILD_EXAMPLES=OFF"
|
||||||
|
|
Loading…
Reference in a new issue