nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ocaml-findlib: Return #t from all phases. 

* gnu/packages/ocaml.scm (ocaml-findlib)[arguments]: Use invoke instead of
system*, and return #t from all phases.
This commit is contained in:
Mark H Weaver 2018-04-12 03:34:53 -04:00
parent 402dedf883
commit 4a810e75aa
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/ocaml.scm
View File

@ -876,7 +876,7 @@ to the other.")
'configure 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(system* (invoke
"./configure" "./configure"
"-bindir" (string-append out "/bin") "-bindir" (string-append out "/bin")
"-config" (string-append out "/etc/ocamfind.conf") "-config" (string-append out "/etc/ocamfind.conf")
@ -886,14 +886,15 @@ to the other.")
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(zero? (system* "make" "install" (invoke "make" "install"
(string-append "OCAML_CORE_STDLIB=" (string-append "OCAML_CORE_STDLIB="
out "/lib/ocaml/site-lib")))))) out "/lib/ocaml/site-lib")))))
(add-after 'install 'remove-camlp4 (add-after 'install 'remove-camlp4
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(delete-file-recursively (delete-file-recursively
(string-append out "/lib/ocaml/site-lib/camlp4")))))))) (string-append out "/lib/ocaml/site-lib/camlp4"))
#t))))))
(home-page "http://projects.camlcity.org/projects/findlib.html") (home-page "http://projects.camlcity.org/projects/findlib.html")
(synopsis "Management tool for OCaml libraries") (synopsis "Management tool for OCaml libraries")
(description (description