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 /gnu/packages/guile.scm | |
| parent | 1feeb2e035a628f788d370fd26fb873f33ae108f (diff) | |
| download | guix-8c4e99cca393608f8be4b163249379590195bdfd.tar guix-8c4e99cca393608f8be4b163249379590195bdfd.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/guile.scm')
| -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 1653685c75..741728d4a8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -431,16 +431,20 @@ many readers as needed).") "--with-gnu-filesystem-hierarchy") #:phases (modify-phases %standard-phases - (add-after 'install 'post-install + (add-before 'build 'fix-libguile-ncurses-file-name (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/share/guile/site/")) - (files (find-files dir ".scm"))) - (substitute* files - (("\"libguile-ncurses\"") - (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" - out))) - #t)))))) + (and (zero? (system* "make" "install" + "-C" "src/ncurses" + "-j" (number->string + (parallel-job-count)))) + (let* ((out (assoc-ref outputs "out")) + (dir "src/ncurses") + (files (find-files dir ".scm"))) + (substitute* files + (("\"libguile-ncurses\"") + (format #f "\"~a/lib/guile/2.0/libguile-ncurses\"" + out))) + #t))))))) (home-page "https://www.gnu.org/software/guile-ncurses/") (synopsis "Guile bindings to ncurses") (description |