diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index ac332f271662..873cb28b5161 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk-unstable, vtk_8, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.2.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "37ad4e20be3a5ecd26c2e4e41b49e778a0246c3d"; - sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; + rev = "v${version}"; + sha256 = "sha256-sRZwRRqqU0xiu4K6xlLQV4xzVNnzMlnRsk+TPiv0wD0="; }; - patches = [ - # Fix build with gcc8 - (fetchpatch { - url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; - sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk-unstable vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f969876f818e..bcba8163bfaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33936,7 +33936,6 @@ with pkgs; angsd = callPackage ../applications/science/biology/angsd { }; ants = callPackage ../applications/science/biology/ants { - stdenv = if stdenv.cc.isGNU && stdenv.system == "x86_64-linux" then gcc10Stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; };