diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 445a8bc5f21d..319f955b9584 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, swig, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; - version = "1.2.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr"; + sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn"; }; - nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk4 ]; + nativeBuildInputs = [ cmake swig ]; + buildInputs = [ lua itk ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; - - enableParallelBuilding = true; + # 2.0.0: linker error building examples + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { - homepage = "http://www.simpleitk.org"; + homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f50fe1a546b..77b8f406c43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15340,9 +15340,7 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { - lua = lua51Packages.lua; - }; + simpleitk = callPackage ../development/libraries/simpleitk { }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;