dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #98582 from bcdarwin/update-simpleitk

Browse Source 
simpleitk: 1.2.4 -> 2.0.0
This commit is contained in:
Lassulus 2020-10-08 22:39:52 +02:00 committed by GitHub
commit 059a2ef9ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/simpleitk/default.nix
View File

@ -1,25 +1,24 @@
{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: { stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "simpleitk"; pname = "simpleitk";
version = "1.2.4"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SimpleITK"; owner = "SimpleITK";
repo = "SimpleITK"; repo = "SimpleITK";
rev = "v${version}"; rev = "v${version}";
sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr"; sha256 = "1nf3cl3ywqg04446xhkb97kcashrgibsihxn2sqrs81i9d0rw5kn";
}; };
nativeBuildInputs = [ cmake git swig ]; nativeBuildInputs = [ cmake swig ];
buildInputs = [ lua itk4 ]; buildInputs = [ lua itk ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; # 2.0.0: linker error building examples
cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.simpleitk.org"; homepage = "https://www.simpleitk.org";
description = "Simplified interface to ITK"; description = "Simplified interface to ITK";
maintainers = with maintainers; [ bcdarwin ]; maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux; platforms = platforms.linux;

4
pkgs/top-level/all-packages.nix
View File

@ -15382,9 +15382,7 @@ in
simp_le = callPackage ../tools/admin/simp_le { }; simp_le = callPackage ../tools/admin/simp_le { };
simpleitk = callPackage ../development/libraries/simpleitk { simpleitk = callPackage ../development/libraries/simpleitk { };
lua = lua51Packages.lua;
};
sfml = callPackage ../development/libraries/sfml { sfml = callPackage ../development/libraries/sfml {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;