diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
commit | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (patch) | |
tree | f25103b54e5edbcface07e28fe999101b7872d97 /pkgs/applications/science | |
parent | 7e912475961c791737f545eeaa3b898b1224a94b (diff) | |
parent | ee1b8e4c7b9134dd8ae18d3476dff1691de20d0f (diff) | |
download | nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.gz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.bz2 nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.lz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.xz nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.zst nixlib-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/biology/ants/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index d1a990a5eb28..834d2497e8df 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk, vtk }: stdenv.mkDerivation rec { _name = "ANTs"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1hrdwv3m9xh3yf7l0rm2ggxc2xzckfb8srs88g485ibfszx7i03q"; }; + patches = [ + # Fix build with gcc8 + (fetchpatch { + url = "https://github.com/ANTsX/ANTs/commit/89af9b2694715bf8204993e032fa132f80cf37bd.patch"; + sha256 = "1glkrwa1jmxxbmzihycxr576azjqby31jwpj165qc54c91pn0ams"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; |