diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-04-07 08:23:08 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-04-07 08:23:08 -0400 |
| commit | 27cec397b1229d6341de52ab878bad80c175c555 (patch) | |
| tree | 3413f6443410a52d3627b7164a6baf7f307cb469 /pkgs/development/libraries/itk | |
| parent | 370452ef41eca6facdcb7d5a2728b33834694ff4 (diff) | |
itk: 4.10 -> 4.11
Also includes a patch to work against clang 4, which was my original motivation for the 4.10 -> 4.11 upgrade (since it fixed another issue)
Diffstat (limited to 'pkgs/development/libraries/itk')
| -rw-r--r-- | pkgs/development/libraries/itk/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 7e3220d8a37ca..3865aa226f9a2 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,13 +1,20 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.10.0"; + name = "itk-4.11.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz; - sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a"; + url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz; + sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6"; }; + # 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 = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" |