[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/12: gnu: laby: Make laby function in pure environments.
From: |
guix-commits |
Subject: |
05/12: gnu: laby: Make laby function in pure environments. |
Date: |
Thu, 11 May 2023 10:39:27 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8cb6fc32a6dfae42086e352c3be7f1ff856fe284
Author: Ivana Drazovic <iv.dra@hotmail.com>
AuthorDate: Wed Apr 19 21:53:55 2023 +0200
gnu: laby: Make laby function in pure environments.
* gnu/packages/games.scm (laby)
[build-system]: Switch to 'glib-or-gtk-build-system'.
[inputs]: Add 'gdk-pixbuf' and 'librsvg-for-system'.
[arguments]: Wrap to use SVG-enabled pixbuf loaders.cache.
Co-authored-by: Florian Pelz <pelzflorian@pelzflorian.de>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/games.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 58c09a5b3b..25f328f736 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -219,6 +219,7 @@
#:use-module (gnu packages xml)
#:use-module (guix build-system copy)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
@@ -5901,9 +5902,15 @@ Linux / Mac OS X servers, and an auto mapper with a
VT100 map display.")
(base32
"1y6nfxcjhqg9bb81hs0wijg7kcwk5kff81rgd8bsv5ps7ia9nj6b"))
(patches (search-patches "laby-make-install.patch"))))
- (build-system gnu-build-system)
+ (build-system glib-or-gtk-build-system)
(inputs
- (list lablgtk3 ocaml-lablgtk3-sourceview3 ocaml ocaml-findlib ocamlbuild))
+ (list gdk-pixbuf
+ lablgtk3
+ (librsvg-for-system)
+ ocaml-lablgtk3-sourceview3
+ ocaml
+ ocaml-findlib
+ ocamlbuild))
(arguments
(list #:phases
#~(modify-phases %standard-phases
@@ -5912,7 +5919,15 @@ Linux / Mac OS X servers, and an auto mapper with a
VT100 map display.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((lablgtk #$(this-package-input "lablgtk")))
(setenv "LD_LIBRARY_PATH"
- (string-append lablgtk "/lib/ocaml/stublibs"))))))
+ (string-append lablgtk "/lib/ocaml/stublibs")))))
+ (add-after 'glib-or-gtk-wrap 'wrap-pixbuf
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((laby (string-append #$output "/bin/laby")))
+ (wrap-program laby
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows laby to
+ ;; function in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))
#:tests? #f ; no 'check' target
#:make-flags
#~(list (string-append "PREFIX=" #$output) "all")))
- branch master updated (ef0aa7ff8b -> 1e4c45b0dc), guix-commits, 2023/05/11
- 02/12: services: dhcp-client-configuration: Add 'shepherd-requirement' field., guix-commits, 2023/05/11
- 01/12: gnu: home: services: fontutils: Add support for SXML fragments., guix-commits, 2023/05/11
- 10/12: services: Add vnstat-service-type., guix-commits, 2023/05/11
- 08/12: gnu: barrier: Include NULL compatibility., guix-commits, 2023/05/11
- 07/12: gnu: git: Update to 2.40.1 [security fixes]., guix-commits, 2023/05/11
- 09/12: doc: Update dicod-configuration example, guix-commits, 2023/05/11
- 05/12: gnu: laby: Make laby function in pure environments.,
guix-commits <=
- 12/12: tests: Add vnstat tests., guix-commits, 2023/05/11
- 03/12: doc: Clarify substitute* docstring with an example., guix-commits, 2023/05/11
- 06/12: gnu: laby: Add patch for being able to execute game code., guix-commits, 2023/05/11
- 04/12: gnu: laby: Use new package style., guix-commits, 2023/05/11
- 11/12: services: inetd: Export accessors., guix-commits, 2023/05/11