me
/
guix
Archived
1
0
Fork 0

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>
master
Ivana Drazovic 2023-04-19 21:53:56 +02:00 committed by Ludovic Courtès
parent 8cb6fc32a6
commit b984ac16dc
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 43 additions and 1 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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