BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ants: 2.2.0 -> 2.4.1

Browse source
This commit is contained in:
Ben Darwin 2022-09-01 14:17:25 -04:00
parent fba5226376
commit 961b308fe1
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/science/biology/ants/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "ANTs"; pname = "ANTs";
version = "2.2.0"; version = "2.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ANTsX"; owner = "ANTsX";
repo = "ANTs"; repo = "ANTs";
rev = "37ad4e20be3a5ecd26c2e4e41b49e778a0246c3d"; rev = "v${version}";
sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; sha256 = "sha256-sRZwRRqqU0xiu4K6xlLQV4xzVNnzMlnRsk+TPiv0wD0=";
}; };
patches = [
# Fix build with gcc8
(fetchpatch {
url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch";
sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams";
})
];
nativeBuildInputs = [ cmake makeWrapper ]; 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" ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

1
pkgs/top-level/all-packages.nix
View file

@ -33936,7 +33936,6 @@ with pkgs;
angsd = callPackage ../applications/science/biology/angsd { }; angsd = callPackage ../applications/science/biology/angsd { };
ants = callPackage ../applications/science/biology/ants { 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; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };