mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: Fix build failures caused by commit
d10092b849
.
* gnu/packages/bioinformatics.scm (seek)[arguments]: Restore previous phase
order.
* gnu/packages/ci.scm (cuirass)[arguments]: Add patch-/bin/sh phase.
This commit is contained in:
parent
1e8d398abc
commit
4561498e1f
2 changed files with 7 additions and 2 deletions
|
@ -4486,7 +4486,7 @@ (define-public seek
|
||||||
"Data2DB"
|
"Data2DB"
|
||||||
"PCL2Bin")))
|
"PCL2Bin")))
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'bootstrap
|
(add-before 'configure 'bootstrap
|
||||||
(lambda _
|
(lambda _
|
||||||
(zero? (system* "bash" "gen_auto"))))
|
(zero? (system* "bash" "gen_auto"))))
|
||||||
(add-after 'build 'build-additional-tools
|
(add-after 'build 'build-additional-tools
|
||||||
|
|
|
@ -216,7 +216,12 @@ (define-public cuirass
|
||||||
(substitute* "Makefile.am"
|
(substitute* "Makefile.am"
|
||||||
(("tests/repo.scm \\\\") "\\"))
|
(("tests/repo.scm \\\\") "\\"))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'disable-repo-tests 'bootstrap
|
(add-after 'disable-repo-tests 'patch-/bin/sh
|
||||||
|
(lambda _
|
||||||
|
(substitute* "build-aux/git-version-gen"
|
||||||
|
(("#!/bin/sh") (string-append "#!" (which "sh"))))
|
||||||
|
#t))
|
||||||
|
(add-after 'patch-/bin/sh 'bootstrap
|
||||||
(lambda _ (zero? (system* "sh" "bootstrap"))))
|
(lambda _ (zero? (system* "sh" "bootstrap"))))
|
||||||
(add-after 'install 'wrap-program
|
(add-after 'install 'wrap-program
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
|
Loading…
Reference in a new issue