guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/12: gnu: laby: Fix build.


From: guix-commits
Subject: 12/12: gnu: laby: Fix build.
Date: Sun, 14 Apr 2019 23:18:54 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit a8f52ad7c1c6fdb33a97989ae546119c256a662b
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon Apr 15 05:09:45 2019 +0200

    gnu: laby: Fix build.
    
    * gnu/packages/games.scm (laby)[inputs]: Add ocamlbuild.
    [arguments]: Add new ’allow-unsafe-strings’ phase.
    Rename ’setenv’ phase to the more meaningful ’set-library-path’.
---
 gnu/packages/games.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c032c4c..0b93409 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3542,12 +3542,19 @@ Linux / Mac OS X servers, and an auto mapper with a 
VT100 map display.")
     (inputs
      `(("lablgtk" ,lablgtk)
        ("ocaml" ,ocaml)
-       ("ocaml-findlib" ,ocaml-findlib)))
+       ("ocaml-findlib" ,ocaml-findlib)
+       ("ocamlbuild" ,ocamlbuild)))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (delete 'configure)
-         (add-before 'build 'setenv
+         (add-before 'build 'allow-unsafe-strings
+           ;; Fix a build failure with ocaml >=4.06.0.
+           ;; See <https://github.com/sgimenez/laby/issues/53>.
+           (lambda _
+             (setenv "OCAMLPARAM" "safe-string=0,_")
+             #t))
+         (add-before 'build 'set-library-path
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((lablgtk (assoc-ref inputs "lablgtk")))
                (setenv "LD_LIBRARY_PATH"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]