diff options
| author | John Darrington <jmd@gnu.org> | 2016-12-19 14:03:40 +0100 |
|---|---|---|
| committer | John Darrington <jmd@gnu.org> | 2016-12-20 06:43:29 +0100 |
| commit | 8c4e99cca393608f8be4b163249379590195bdfd (patch) | |
| tree | 5842f0f572bca54c3c89ce993569ad9892723a6b | |
| parent | 1feeb2e035a628f788d370fd26fb873f33ae108f (diff) | |
gnu: Fix load-extension path in packaging of guile-ncurses.
* gnu/packages/guile.scm (guile-ncurses) [arguments]: Install shared object before
attempting to build the package. Patch load-extension path before building instead
of after.
| -rw-r--r-- | gnu/packages/guile.scm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 1653685c758..741728d4a80 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm | |||
| @@ -431,16 +431,20 @@ many readers as needed).") | |||
| 431 | "--with-gnu-filesystem-hierarchy") | 431 | "--with-gnu-filesystem-hierarchy") |
| 432 | #:phases | 432 | #:phases |
| 433 | (modify-phases %standard-phases | 433 | (modify-phases %standard-phases |
| 434 | (add-after 'install 'post-install | 434 | (add-before 'build 'fix-libguile-ncurses-file-name |
| 435 | (lambda* (#:key outputs #:allow-other-keys) | 435 | (lambda* (#:key outputs #:allow-other-keys) |
| 436 | (let* ((out (assoc-ref outputs "out")) | 436 | (and (zero? (system* "make" "install" |
| 437 | (dir (string-append out "/share/guile/site/")) | 437 | "-C" "src/ncurses" |
| 438 | (files (find-files dir ".scm"))) | 438 | "-j" (number->string |
| 439 | (substitute* files | 439 | (parallel-job-count)))) |
| 440 | (("\"libguile-ncurses\"") | 440 | (let* ((out (assoc-ref outputs "out")) |
| 441 | (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" | 441 | (dir "src/ncurses") |
| 442 | out))) | 442 | (files (find-files dir ".scm"))) |
| 443 | #t)))))) | 443 | (substitute* files |
| 444 | (("\"libguile-ncurses\"") | ||
| 445 | (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" | ||
| 446 | out))) | ||
| 447 | #t))))))) | ||
| 444 | (home-page "https://www.gnu.org/software/guile-ncurses/") | 448 | (home-page "https://www.gnu.org/software/guile-ncurses/") |
| 445 | (synopsis "Guile bindings to ncurses") | 449 | (synopsis "Guile bindings to ncurses") |
| 446 | (description | 450 | (description |
