diff options
| author | Orivej Desh <orivej@gmx.fr> | 2021-02-06 19:02:09 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2021-02-06 19:20:56 +0000 |
| commit | 8d0af26e1de55f504766b3c4d92b69121a60851e (patch) | |
| tree | 241293bdf98a316614738266e9c647d23d7a705b /pkgs/applications/science | |
| parent | f777388ff00832f32086a34c4358c6791007ebd2 (diff) | |
blast: 2.10.0 -> 2.11.0
Fixes build with gcc10.
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/blast/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/blast/no_slash_bin.patch | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 6fd061f1402d8..877b5b7d34c02 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: +{ lib, stdenv, buildPackages, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: stdenv.mkDerivation rec { pname = "blast"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s"; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq"; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { --replace /bin/date ${coreutils}/bin/date ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; # perl is necessary in buildInputs so that installed perl scripts get patched diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/pkgs/applications/science/biology/blast/no_slash_bin.patch index 9b78ac5792645..851e37fa905db 100644 --- a/pkgs/applications/science/biology/blast/no_slash_bin.patch +++ b/pkgs/applications/science/biology/blast/no_slash_bin.patch @@ -171,14 +171,8 @@ diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install. GREP = @GREP@ --- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800 +++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800 -@@ -10417,10 +10417,6 @@ - echo "${ECHO_T}no, using $LN_S" >&6; } - fi - +@@ -10417,4 +10417,0 @@ -case "$LN_S" in - /*) ;; - * ) LN_S=/bin/$LN_S ;; -esac - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |