diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4d98b12928f..e55a72fb9f8 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,32 +1,26 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "SuperElastix"; repo = pname; rev = version; - sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; + sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; }; patches = [ (fetchpatch { - name = "itk-5.1-compat.patch"; - url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; - sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; - }) - (fetchpatch { - name = "fix-osx-build.patch"; - url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; - sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 + url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; + sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; }) ]; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk ]; + buildInputs = [ itk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15e49b650..667503f6e80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12342,7 +12342,9 @@ in 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 { };