diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 19:59:55 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 22:16:22 +0300 |
| commit | 64df08f0cfac8f7a329002afa3461fd62a4b229c (patch) | |
| tree | 019909423138ceb49cdd86f1af48d366503db68f /gnu/packages/guile.scm | |
| parent | b83ad3ace56c65a367e8f58c7b78323cf251b94b (diff) | |
| parent | 0ef1c223071869488c35b72b7407234c11425589 (diff) | |
| download | guix-patches-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar guix-patches-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6dacc472a8..0bcc524ed7 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -365,7 +365,7 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -s") ;; reasons. It does not fail when run outside of Guix. (("tests/database.scm") "")) #t)) - (add-before 'configure 'autogen + (add-after 'fix-bug-22 'autogen (lambda _ (zero? (system* "sh" "autogen.sh"))))))) (inputs @@ -654,12 +654,12 @@ format is also supported.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ - ;; Repository comes with a broken symlink - (delete-file "README") - (symlink "README.org" "README") - (zero? (system* "autoreconf" "-fi"))))))) + (add-after 'unpack 'autoreconf + (lambda _ + ;; Repository comes with a broken symlink + (delete-file "README") + (symlink "README.org" "README") + (zero? (system* "autoreconf" "-fi"))))))) (native-inputs `(("autoconf" ,(autoconf-wrapper)) ("automake" ,automake) @@ -1126,7 +1126,7 @@ Guile's foreign function interface.") ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'autoreconf + (add-after 'unpack 'autoreconf (lambda _ (zero? (system* "autoreconf" "-vfi")))) (add-before 'build 'set-sqlite3-file-name |