1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00

blast: 2.10.0 -> 2.11.0

Fixes build with gcc10.
This commit is contained in:
Orivej Desh 2021-02-06 19:02:09 +00:00
parent f777388ff0
commit 8d0af26e1d
2 changed files with 6 additions and 11 deletions

View file

@ -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

View file

@ -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.