[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
153/155: gnu: lablgtk: use ocamlfind in installation
From: |
John Darrington |
Subject: |
153/155: gnu: lablgtk: use ocamlfind in installation |
Date: |
Wed, 21 Dec 2016 20:48:43 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 2781805c4fdaf1d909a72e59e1006bb1ecaf57aa
Author: Julien Lepiller <address@hidden>
Date: Tue Dec 13 11:21:51 2016 +0100
gnu: lablgtk: use ocamlfind in installation
* gnu/packages/ocaml.scm (lablgtk): Use ocamlfind in installation.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/ocaml.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index bc9f8f8..555e3fd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -507,6 +507,7 @@ Knuth’s LR(1) parser construction technique.")
(native-inputs
`(("camlp4" ,camlp4)
("ocaml" ,ocaml)
+ ("findlib" ,ocaml-findlib)
("pkg-config" ,pkg-config)))
;; FIXME: Add inputs gtkgl-2.0, libpanelapplet-2.0, gtkspell-2.0,
;; and gtk+-quartz-2.0 once available.
@@ -521,21 +522,24 @@ Knuth’s LR(1) parser construction technique.")
`(#:tests? #f ; no check target
;; opt: also install cmxa files
- #:make-flags (list "all" "opt")
+ #:make-flags (list "all" "opt"
+ (string-append "FINDLIBDIR="
+ (assoc-ref %outputs "out")
+ "/lib/ocaml"))
;; Occasionally we would get "Error: Unbound module GtkThread" when
;; compiling 'gtkThInit.ml', with 'make -j'. So build sequentially.
#:parallel-build? #f
#:phases
(modify-phases %standard-phases
- (replace 'install
+ (add-before 'install 'prepare-install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(ocaml (assoc-ref inputs "ocaml")))
;; Install into the output and not the ocaml directory.
+ (mkdir-p (string-append out "/lib/ocaml"))
(substitute* "config.make"
((ocaml) out))
- (system* "make" "old-install")
#t))))))
(home-page "http://lablgtk.forge.ocamlcore.org/")
(synopsis "GTK+ bindings for OCaml")
- 111/155: gnu: aspell-dictionary: Use ‘modify-phases’ syntax., (continued)
- 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, 2016/12/21
- 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 <=
- 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
- 122/155: Update NEWS., John Darrington, 2016/12/21
- 01/155: gnu: Add graphical installer, John Darrington, 2016/12/21
- 33/155: doc: Update dot graphs., John Darrington, 2016/12/21
- 142/155: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el., John Darrington, 2016/12/21
- 113/155: gnu: hunspell: Update to 1.5.4., John Darrington, 2016/12/21
- 114/155: gnu: hunspell: Add missing perl dependency., John Darrington, 2016/12/21
- 131/155: import: github: Use 'json-fetch'., John Darrington, 2016/12/21
- 151/155: Revert "gnu: curl: Update replacement to 7.52.0 [fixes CVE-2016-{9586, 9952, 9953}].", John Darrington, 2016/12/21