diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
| commit | a76585e5535f433d37c0900cf0b2d3c9d3b3461c (patch) | |
| tree | 007befec20e2a33117256eeee11b7c642179dad4 /gnu/packages/bioinformatics.scm | |
| parent | 1dc32c2961402c946c25e5a1aabe79a30cce3cff (diff) | |
| parent | c427fda233a7da0c8eb27e244a562c51d3835503 (diff) | |
| download | guix-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar guix-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bioinformatics.scm')
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1f1b686c71..5e8eef4e1c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3450,7 +3450,7 @@ sequences).") (("^#include \"kseq\\.h\"") "#include \"htslib/kseq.h\"")) #t)) - (add-before 'configure 'autoconf + (add-after 'fix-includes 'autoconf (lambda _ (zero? (system* "autoconf"))))))) (native-inputs `(("autoconf" ,autoconf) @@ -4486,7 +4486,7 @@ distribution, coverage uniformity, strand specificity, etc.") "Data2DB" "PCL2Bin"))) (modify-phases %standard-phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "bash" "gen_auto")))) (add-after 'build 'build-additional-tools @@ -6164,8 +6164,8 @@ track. The database is exposed as a @code{TxDb} object.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'configure 'autogen - (lambda _ (zero? (system* "autoreconf" "-vif"))))))) + (add-after 'unpack 'autogen + (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs `(("zlib" ,zlib) ("bzip2" ,bzip2) @@ -8381,14 +8381,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.") AC_DEFINE([PLD_png], [1], [Define to 1 if PNG support is available]) AM_CONDITIONAL(AMPNG, true)")) #t)) - (add-after 'unpack 'disable-update-check + (add-after 'fix-checks 'disable-update-check (lambda _ ;; At build time there is no connection to the Internet, so ;; looking for updates will not work. (substitute* "Makefile.am" (("\\$\\(bindir\\)/embossupdate") "")) #t)) - (add-before 'configure 'autogen + (add-after 'disable-update-check 'autogen (lambda _ (zero? (system* "autoreconf" "-vif"))))))) (inputs `(("perl" ,perl) @@ -9453,7 +9453,7 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (substitute-keyword-arguments (package-arguments htslib) ((#:phases phases) `(modify-phases ,phases - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vif")))))))) (native-inputs |