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/guile.scm | |
| parent | 1dc32c2961402c946c25e5a1aabe79a30cce3cff (diff) | |
| parent | c427fda233a7da0c8eb27e244a562c51d3835503 (diff) | |
| download | patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar.gz | |
Merge branch 'master' into staging
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 |