Dmitry Polyakov wrote 4 years ago
(address . guix-patches@gnu.org)
hope this work
From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00 2001
From: Dmitry Polyakov <liltechdude@gmail.com>
Subject: [PATCH] gnu: Add instead.
* gnu/local.mk (instead): New variable.
---
gnu/local.mk | 2 +
gnu/packages/game-development.scm | 45
+++++++++++++++++++
.../patches/instead-use-games-path.patch | 28 ++++++++++++
3 files changed, 75 insertions(+)
create mode 100644 gnu/packages/patches/instead-use-games-path.patch
Toggle diff (127 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index b9b4b66..923231f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -40,6 +40,7 @@
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
#
# This file is part of GNU Guix.
#
@@ -1187,6 +1188,7 @@ dist_patch_DATA = \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
+ %D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/iputils-libcap-compat.patch \
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index 92c3da9..a117058 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1961,6 +1962,50 @@ all modern computing platforms. Each library
component is fairly independent
of the others")
(license license:lgpl2.0+)))
+(define-public instead
+ (package
+ (name "instead")
+ (version "3.3.2")
+ (build-system cmake-build-system)
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/instead-hub/instead")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
"014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f"))
+ (patches
+ (search-patches
+ "instead-use-games-path.patch"))))
+ (arguments
+ '(#:configure-flags
+ (list (string-append
+ "-DLUA_INCLUDE_DIR="
+ (assoc-ref %build-inputs "luajit")
"/include/luajit-2.1/")
+ "-DWITH_LUAJIT=1"
+ "-DWITH_GTK3=1")
+ #:tests? #f))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("sdl2-images" ,sdl2-image)
+ ("sdl2-ttf" ,sdl2-ttf)
+ ("lua" ,lua)
+ ("sdl2-mixer" ,sdl2-mixer)
+ ("luajit" ,luajit)
+ ("gtk+",gtk+)))
+ (home-page "https://instead3.syscall.ru/")
+ (synopsis "Simple text adventure interpreter for Unix and
Windows")
+ (description "Simple text adventure interpreter for Unix and
Windows.")
+ (license (list license:gpl2 license:zlib))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "INSTEAD_GAMES_PATH")
+ (separator #f) ;single entry
+ (files '("share/instead/games")))))))
+
(define-public ioquake3
;; We follow master since it seems that there won't be releases
after 1.3.6.
(let ((commit "95b9cab4d644fa3bf757cfff821cc4f7d76e38b0"))
diff --git a/gnu/packages/patches/instead-use-games-path.patch
b/gnu/packages/patches/instead-use-games-path.patch
new file mode 100644
index 0000000..2e460bf
--- /dev/null
+++ b/gnu/packages/patches/instead-use-games-path.patch
@@ -0,0 +1,28 @@
+From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00
2001
+From: Dmitry Polyakov <liltechdude@gmail.com>
+Date: Wed, 3 Feb 2021 14:33:37 -0500
+Subject: [PATCH] add custom gamedir support
+
+---
+ src/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main.c b/src/main.c
+index 9e6e2c3b..860bd3aa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -366,6 +366,12 @@ int instead_main(int argc, char *argv[])
+ setdir(game_cwd);
+ profile_load(NULL);
+
++ char *gamespath_env = NULL;
++
++ if (gamespath_env = getenv("INSTEAD_GAMES_PATH"), gamespath_env
!= NULL) {
++ games_sw = strdup(gamespath_env);
++ }
++
+ for (i = 1; i < argc; i++) {
+ if (lua_sw) /* during load profile */
+ break;
+--
+2.30.0
--
2.30.0
--
魔法少女リルテチヅデですよ。
-----BEGIN PGP SIGNATURE-----
iQJNBAEBCgA3FiEEAbBRoIRjq1x/LhdPuT3EB6aJ2cMFAmAg5tsZHHBvbHlha292
QGxpbHRlY2hkdWRlLnh5egAKCRC5PcQHponZw4MmD/9FcfEeFlKSgolZpK0VeoRs
Jy+kVVJljAg2sQIev4FXLls4U3GuDYi/YOHJKOjLpgL/AogeI+p1xbujLP9Fi9uG
eqsW0rXAqSqDbOFQUnRh17AFbbBYeEntFL8gAWehxzt59DIiak+E6STnPjrfpXck
wdrDxVK1DJ92ncJMhyBwbQvXfGAYPhKItKWAl1CTJF4Eh8zruUj0jgn8led4LHMt
/NCcRZQhefMh8rTI/4u2FuuOBCW/9eQeoDC/b+fEmF4RB0ANf2SqlkQOaU8LMVsr
Aj8XyG3OCwDfmOQmxYmYmvEBj31mRGaA/REO2MwbQnTpC9CQjd0M/tRP2WmSZfEX
VWgxHEYCckcpTK0JyHRMlsofybCp8gISm544jB/BnKvGRmnmOzMpOgIXQm5Rz3yq
utlV6IO8tnuTLjORI8fZhxOAMCAcOsYgtrjwWd0gXcDBEzlYaYFkaN7rIxz+Xmsd
qpIzyxp4xQU46qnDUva4IL6D0Ia2kizOoP8Awxbc8zhRSBm+V3OpDYzUPK94fRF9
qCQ7fxppA3SApR6ooAQYEanViwvxLiix/79Ysx+YKpgq034HE0BhtOui+P8Nf4DN
rCw99L8fvWSBDbfcKlij518X17zgrtadxHk+eIgO8lJTiNVrIQGX31IcPB9d3Akn
R/TiNObrrFx6/4/2Zt4dFg==
=/UGL
-----END PGP SIGNATURE-----