me/guix
Archived
1
0
Fork 0
Code Activity

gnu: laby: Fix build.

Browse source 
* gnu/packages/games.scm (laby)[inputs]: Use lablgtk3.
[arguments]: Remove allow-unsafe-strings phase.
This commit is contained in:
Julien Lepiller 2021-11-20 04:02:54 +01:00
parent 42eeea188d
commit 70a88dac11
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/games.scm
View file

@ -5642,7 +5642,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.")
(patches (search-patches "laby-make-install.patch")))) (patches (search-patches "laby-make-install.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("lablgtk" ,lablgtk) `(("lablgtk3" ,lablgtk3)
("ocaml" ,ocaml) ("ocaml" ,ocaml)
("ocaml-findlib" ,ocaml-findlib) ("ocaml-findlib" ,ocaml-findlib)
("ocamlbuild" ,ocamlbuild))) ("ocamlbuild" ,ocamlbuild)))
@ -5650,15 +5650,9 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 map display.")
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(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 (add-before 'build 'set-library-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((lablgtk (assoc-ref inputs "lablgtk"))) (let ((lablgtk (assoc-ref inputs "lablgtk3")))
(setenv "LD_LIBRARY_PATH" (setenv "LD_LIBRARY_PATH"
(string-append lablgtk "/lib/ocaml/stublibs")))))) (string-append lablgtk "/lib/ocaml/stublibs"))))))
#:tests? #f ; no 'check' target #:tests? #f ; no 'check' target