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

elastix: 5.0.0 -> 5.0.1; unbreak OS X build

This commit is contained in:
Ben Darwin 2020-10-05 14:28:46 -04:00 committed by Jon
parent 347cb204ca
commit e20652da9b
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/science/biology/elastix/default.nix
View File

@ -1,32 +1,26 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: { stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elastix"; pname = "elastix";
version = "5.0.0"; version = "5.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SuperElastix"; owner = "SuperElastix";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "itk-5.1-compat.patch"; name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305
url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch";
sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5";
})
(fetchpatch {
name = "fix-osx-build.patch";
url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch";
sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q";
}) })
]; ];
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];
buildInputs = [ itk ]; buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
doCheck = !stdenv.isDarwin; # usual dynamic linker issues doCheck = !stdenv.isDarwin; # usual dynamic linker issues

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

@ -12342,7 +12342,9 @@ in
egl-wayland = callPackage ../development/libraries/egl-wayland {}; egl-wayland = callPackage ../development/libraries/egl-wayland {};
elastix = callPackage ../development/libraries/science/biology/elastix { }; elastix = callPackage ../development/libraries/science/biology/elastix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };