[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/12: gnu: laby: Add patch for being able to execute game code.
From: |
guix-commits |
Subject: |
06/12: gnu: laby: Add patch for being able to execute game code. |
Date: |
Thu, 11 May 2023 10:39:27 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit b984ac16dc9c5af27fb2355dc15bb333cbf7eaef
Author: Ivana Drazovic <iv.dra@hotmail.com>
AuthorDate: Wed Apr 19 21:53:56 2023 +0200
gnu: laby: Add patch for being able to execute game code.
Reported upstream at https://github.com/sgimenez/laby/pull/68
* gnu/packages/patches/laby-use-tmpdir-from-runtime.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/games.scm (laby)[source]: Use it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/local.mk | 2 ++
gnu/packages/games.scm | 3 +-
.../patches/laby-use-tmpdir-from-runtime.patch | 39 ++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 664e11b2ea..83c834fa51 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -57,6 +57,7 @@
# Copyright © 2022 ( <paren@disroot.org>
# Copyright © 2022 jgart <jgart@dismail.de>
# Copyright © 2023 Zheng Junjie <873216071@qq.com>
+# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
#
# This file is part of GNU Guix.
#
@@ -1432,6 +1433,7 @@ dist_patch_DATA =
\
%D%/packages/patches/kodi-mesa-eglchromium.patch \
%D%/packages/patches/kwayland-skip-flaky-test.patch \
%D%/packages/patches/laby-make-install.patch \
+ %D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
%D%/packages/patches/ldns-drill-examples.patch \
%D%/packages/patches/leela-zero-gtest.patch \
%D%/packages/patches/less-hurd-path-max.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 25f328f736..bae79ee48b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5901,7 +5901,8 @@ Linux / Mac OS X servers, and an auto mapper with a VT100
map display.")
(sha256
(base32
"1y6nfxcjhqg9bb81hs0wijg7kcwk5kff81rgd8bsv5ps7ia9nj6b"))
- (patches (search-patches "laby-make-install.patch"))))
+ (patches (search-patches "laby-make-install.patch"
+ "laby-use-tmpdir-from-runtime.patch"))))
(build-system glib-or-gtk-build-system)
(inputs
(list gdk-pixbuf
diff --git a/gnu/packages/patches/laby-use-tmpdir-from-runtime.patch
b/gnu/packages/patches/laby-use-tmpdir-from-runtime.patch
new file mode 100644
index 0000000000..ea6324a91b
--- /dev/null
+++ b/gnu/packages/patches/laby-use-tmpdir-from-runtime.patch
@@ -0,0 +1,39 @@
+Reported as <https://github.com/sgimenez/laby/pull/68>
+
+diff --git a/build b/build
+index 992a9e3..0df74d9 100755
+--- a/build
++++ b/build
+@@ -7,7 +7,6 @@ source build.conf || exit 1
+
+ export PREFIX=${PREFIX-/usr}
+ export DATADIR=${DATADIR-${PREFIX}/share}
+-export TMPDIR=${TMPDIR-/tmp}
+
+ export PROJECT_NAME=${PROJECT_NAME-unknown}
+ export PROJECT_VERSION=${PROJECT_VERSION-unknown}
+diff --git a/src/config.sh b/src/config.sh
+index 19d4160..9338aad 100644
+--- a/src/config.sh
++++ b/src/config.sh
+@@ -29,5 +29,4 @@ let build_ocaml = "${OCAML_VERSION}"
+ let build_lablgtk = "${BUILD_LABLGTK}"
+ let build_lablgtk_sourceview = "${BUILD_LABLGTKSV}"
+ let _ = Res.sys_data_dir := "${DATADIR}"
+-let _ = Res.sys_tmp_dir := "${TMPDIR}"
+ EOF
+diff --git a/src/laby.ml b/src/laby.ml
+index b77f2b2..e17acb9 100644
+--- a/src/laby.ml
++++ b/src/laby.ml
+@@ -48,6 +48,7 @@ let opts =
+
+ let _ =
+ Printexc.record_backtrace true;
++ Res.sys_tmp_dir := Filename.get_temp_dir_name ();
+ Run.init
+ ~name:Config.project_name
+ ~conf:(conf, ["conf"])
+--
+2.34.1
+
- 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, 2023/05/11
- 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 <=
- 04/12: gnu: laby: Use new package style., guix-commits, 2023/05/11
- 11/12: services: inetd: Export accessors., guix-commits, 2023/05/11