[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
117/155: gnu: Fix load-extension path in packaging of guile-ncurses.
From: |
John Darrington |
Subject: |
117/155: gnu: Fix load-extension path in packaging of guile-ncurses. |
Date: |
Wed, 21 Dec 2016 20:48:38 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit e60a86b261c10d2c0f47317dd94f8eec0dc6ede2
Author: John Darrington <address@hidden>
Date: Mon Dec 19 14:03:40 2016 +0100
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.
---
gnu/packages/guile.scm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 1653685..741728d 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
- 116/155: gnu: argon2: Update to 20161029., (continued)
- 116/155: gnu: argon2: Update to 20161029., John Darrington, 2016/12/21
- 115/155: gnu: cppcheck: Update to 1.76.1., John Darrington, 2016/12/21
- 135/155: gnu: gnupg: Remove unneeded input., John Darrington, 2016/12/21
- 132/155: Revert "gnu: nss, nss-certs: Update to 3.27.2.", John Darrington, 2016/12/21
- 140/155: gnu: getmail: Update to 4.52.0., John Darrington, 2016/12/21
- 129/155: gnu: Add alsa-plugins., John Darrington, 2016/12/21
- 139/155: gnu: bogofilter: Use 'modify-phases'., John Darrington, 2016/12/21
- 96/155: gnu: Add grub-efi., John Darrington, 2016/12/21
- 111/155: gnu: aspell-dictionary: Use ‘modify-phases’ syntax., John Darrington, 2016/12/21
- 124/155: doc: Replace fingerprint of OpenPGP signing key., John Darrington, 2016/12/21
- 117/155: gnu: Fix load-extension path in packaging of guile-ncurses.,
John Darrington <=
- 143/155: gnu: nmap: Update to 7.40., John Darrington, 2016/12/21
- 146/155: gnu: xcape: Update to 1.2., John Darrington, 2016/12/21
- 141/155: gnu: msmtp: Update to 1.6.6., John Darrington, 2016/12/21
- 150/155: gnu: mlt: Update to 6.4.1., John Darrington, 2016/12/21
- 154/155: gnu: coq: Build coqide, John Darrington, 2016/12/21
- 147/155: gnu: xcb-util-xrm: Update to 1.2., John Darrington, 2016/12/21
- 148/155: gnu: xf86-video-vmware: Update to 13.2.1., John Darrington, 2016/12/21
- 153/155: gnu: lablgtk: use ocamlfind in installation, John Darrington, 2016/12/21
- 155/155: installer: Add alternate method of finding TZDIR., John Darrington, 2016/12/21
- 89/155: Revert "gnu: linux-libre: Update to 4.9.", John Darrington, 2016/12/21