From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 47824@debbugs.gnu.org
Subject: [bug#47824] [PATCH 3/3] gnu: tsukundere: Update to 0.3.0.
Date: Fri, 16 Apr 2021 13:07:23 +0200 [thread overview]
Message-ID: <20210416110723.9938-3-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <20210416110723.9938-1-leo.prikler@student.tugraz.at>
* gnu/packages/game-development.scm (tsukundere): Update to 0.3.0.
[patch-command]: Patch path to guile. Construct load paths directly from
inputs.
[propagated-inputs]: Remove.
[inputs]: Add guile (as guile-runtime) and guile-sdl2.
---
gnu/packages/game-development.scm | 45 +++++++++++++++++++------------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0d4855d275..98ef88971a 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -493,7 +493,7 @@ clone.")
(define-public tsukundere
(package
(name "tsukundere")
- (version "0.2.3")
+ (version "0.3.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -502,10 +502,11 @@ clone.")
(file-name (git-file-name name version))
(sha256
(base32
- "05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw"))))
+ "06jiaylbnx8khicsaq2gwnd8wspjhjymbb5z6x5445krklk0jx18"))))
(build-system gnu-build-system)
(arguments
- `(#:modules (((guix build guile-build-system)
+ `(#:modules ((srfi srfi-1)
+ ((guix build guile-build-system)
#:select (target-guile-effective-version))
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
@@ -513,22 +514,31 @@ clone.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-command
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (version (target-guile-effective-version))
- (scm (string-append out "/share/guile/site/"
- version))
- (go (string-append out "/lib/guile/"
- version "/site-ccache")))
-
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((version (target-guile-effective-version))
+ (scm (lambda (in)
+ (string-append in "/share/guile/site/"
+ version)))
+ (go (lambda (in)
+ (string-append in "/lib/guile/" version
+ "/site-ccache")))
+ (pkgs
+ (cons
+ (assoc-ref outputs "out")
+ (filter-map
+ (lambda (input)
+ (and (string-prefix? "guile-" (car input)) (cdr input)))
+ inputs))))
(substitute* "bin/tsukundere"
- (("exec guile .*" all)
+ (("exec guile (.*)" _ args)
(string-append
(format #f "export GUILE_LOAD_PATH=~@?~%"
- "\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH"))
+ "\"~{~a~^:~}\"" (map scm pkgs))
(format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%"
- "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH"))
- all)))
+ "\"~{~a~^:~}\"" (map go pkgs))
+ "exec "
+ (assoc-ref inputs "guile-runtime")
+ "/bin/guile " args)))
#t))))))
(native-inputs
`(("autoconf" ,autoconf)
@@ -536,8 +546,9 @@ clone.")
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
- (propagated-inputs
- `(("guile-sdl2" ,guile3.0-sdl2)))
+ (inputs
+ `(("guile-sdl2" ,guile3.0-sdl2)
+ ("guile-runtime" ,guile-3.0)))
(home-page "https://gitlab.com/leoprikler/tsukundere")
(synopsis "Visual novel engine")
(description "Tsukundere is a game engine geared heavily towards the
--
2.31.1
next prev parent reply other threads:[~2021-04-16 11:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 11:05 [bug#47824] [PATCH 0/3] Happy hacking in the Spring 2021 LGJ Leo Prikler
2021-04-16 11:07 ` [bug#47824] [PATCH 1/3] gnu: guile-sdl2: Update to 0.6.0 Leo Prikler
2021-04-16 11:07 ` [bug#47824] [PATCH 2/3] gnu: guile-chickadee: Update to 0.7.0 Leo Prikler
2021-04-16 11:07 ` Leo Prikler [this message]
2021-04-19 7:56 ` [bug#47824] [PATCH 3/3] gnu: tsukundere: Update to 0.3.0 Efraim Flashner
2021-04-19 8:24 ` Leo Prikler
2021-04-19 8:17 ` [bug#47824] [PATCH v2 1/3] gnu: guile-sdl2: Update to 0.6.0 Leo Prikler
2021-04-19 8:17 ` [bug#47824] [PATCH v2 2/3] gnu: guile-chickadee: Update to 0.7.0 Leo Prikler
2021-04-19 8:17 ` [bug#47824] [PATCH v2 3/3] gnu: tsukundere: Update to 0.3.0 Leo Prikler
2021-05-05 14:16 ` [bug#47824] [PATCH 0/3] Happy hacking in the Spring 2021 LGJ Ludovic Courtès
2021-05-05 15:00 ` Leo Prikler
2021-05-06 10:52 ` Ludovic Courtès
2021-05-06 11:03 ` Leo Prikler
2021-05-15 8:35 ` Leo Prikler
2021-05-15 13:45 ` Ludovic Courtès
2021-05-15 14:02 ` Leo Prikler
2021-05-15 18:32 ` [bug#47824] [PATCH] gnu: tsukundere: Update to 0.3.0 Leo Prikler
2021-05-16 20:21 ` Ludovic Courtès
2021-05-16 22:27 ` bug#47824: " Leo Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416110723.9938-3-leo.prikler@student.tugraz.at \
--to=leo.prikler@student.tugraz.at \
--cc=47824@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).