03/05: gnu: ocaml-ocb-stubblr: Fix build failures using it.

[guix-commits]

roptat pushed a commit to branch master
in repository guix.

commit 70a5701141a50847c15a87a23c8d3a5a03dc63a2
Author: Julien Lepiller <address@hidden>
Date:   Tue May 14 20:37:05 2019 +0200

    gnu: ocaml-ocb-stubblr: Fix build failures using it.
    
    * gnu/packages/ocaml.scm (ocaml-ocb-stubblr)[arguments]: Add a phase to
    fix guix-specific issues.
---
 gnu/packages/ocaml.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a4d5ede..638a043 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3153,7 +3153,15 @@ without writing or generating any C!")
     `(#:build-flags (list "build" "--tests" "true")
       #:phases
       (modify-phases %standard-phases
-        (delete 'configure))))
+        (delete 'configure)
+        (add-before 'build 'fix-for-guix
+          (lambda _
+            (substitute* "src/ocb_stubblr.ml"
+              ;; Do not fail when opam is not present or initialized
+              (("error_msgf \"error running opam\"") "\"\"")
+              ;; Guix doesn't have cc, but it has gcc
+              (("\"cc\"") "\"gcc\""))
+            #t)))))
    (inputs
     `(("topkg" ,ocaml-topkg)
       ("opam" ,opam)))