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

simpleitk: itk -> itk4

Browse Source 
- simpleitk 1.2.4 is incompatible with ITK 5.1, so this can be reverted when 2.x is released.
This commit is contained in:
Ben Darwin 2020-04-27 14:42:17 -04:00
parent 404834334b
commit 20cf206a09
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }:
{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }:
stdenv.mkDerivation rec {
pname = "simpleitk";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake git swig ];
buildInputs = [ lua itk ];
buildInputs = [ lua itk4 ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];

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

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