From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 49329@debbugs.gnu.org
Subject: [bug#49329] [PATCH 3/4] gnu: python2-renpy: Correct inputs.
Date: Fri, 2 Jul 2021 15:58:17 +0200 [thread overview]
Message-ID: <20210702135818.16084-3-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <20210702135818.16084-1-leo.prikler@student.tugraz.at>
* gnu/packages/game-development.scm (python2-renpy)[#:phases]<fix-commands>:
Search for ‘xdg-open’ in inputs.
<set-build-vars>: Search for ‘cython’ in native-inputs.
[native-inputs]: Move ‘xdg-utils’ from here…
[inputs]: … to here.
---
gnu/packages/game-development.scm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 9b231ad333..7c5d45c412 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1186,10 +1186,11 @@ developed mainly for Ren'py.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-commands
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "renpy/editor.py"
(("xdg-open")
- (which "xdg-open")))
+ (string-append (assoc-ref inputs "xdg-utils")
+ "/bin/xdg-open")))
#t))
(add-after 'unpack 'fix-include-paths
(lambda* (#:key inputs #:allow-other-keys)
@@ -1199,9 +1200,10 @@ developed mainly for Ren'py.")
"/include/fribidi")))
#t))
(add-after 'set-paths 'set-build-vars
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
(setenv "RENPY_CYTHON"
- (string-append (assoc-ref inputs "python2-cython")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "python2-cython")
"/bin/cython"))
(setenv "RENPY_DEPS_INSTALL" (string-join (map cdr inputs) ":"))
#t))
@@ -1240,14 +1242,14 @@ developed mainly for Ren'py.")
("glew" ,glew)
("libpng" ,libpng)
("sdl-union"
- ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
+ ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))
+ ("xdg-utils" ,xdg-utils)))
(propagated-inputs
`(("python2-future" ,python2-future)
("python2-pygame" ,python2-pygame-sdl2)))
(native-inputs
`(("gcc" ,gcc-8) ; for const variables as initializer elements
- ("python2-cython" ,python2-cython)
- ("xdg-utils" ,xdg-utils)))
+ ("python2-cython" ,python2-cython)))
(home-page "https://www.renpy.org/")
(synopsis "Ren'py python module")
(description "This package contains the shared libraries and Python modules
--
2.32.0
next prev parent reply other threads:[~2021-07-02 13:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 12:39 [bug#49329] [PATCH 00/??] Improve Ren'py package Leo Prikler
2021-07-02 13:58 ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources Leo Prikler
2021-07-02 13:58 ` [bug#49329] [PATCH 2/4] gnu: python2-renpy: Update description Leo Prikler
2021-07-02 13:58 ` Leo Prikler [this message]
2021-07-02 13:58 ` [bug#49329] [PATCH 4/4] gnu: renpy: Correct inputs Leo Prikler
2021-07-03 7:50 ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources zimoun
2021-07-03 8:35 ` Leo Prikler
2021-07-11 3:50 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11 8:28 ` [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources zimoun
2021-07-11 9:53 ` Leo Prikler
2021-07-15 6:47 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-03 9:28 ` [bug#49329] [PATCH v2 1/5] gnu: python2-renpy: Drop unused Ren'py sources Leo Prikler
2021-07-03 9:28 ` [bug#49329] [PATCH v2 2/5] gnu: python2-renpy: Update description Leo Prikler
2021-07-11 4:53 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11 7:09 ` Leo Prikler
2021-07-15 6:48 ` Chris Marusich
2021-07-03 9:28 ` [bug#49329] [PATCH v2 3/5] gnu: python2-renpy: Correct inputs Leo Prikler
2021-07-11 4:55 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-03 9:28 ` [bug#49329] [PATCH v2 4/5] gnu: renpy: Correct inputs Leo Prikler
2021-07-11 4:37 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11 6:58 ` Leo Prikler
2021-07-03 9:28 ` [bug#49329] [PATCH v2 5/5] gnu: Add python-pygame-sdl2 Leo Prikler
2021-07-11 4:44 ` [bug#49329] [PATCH 00/??] Improve Ren'py package Chris Marusich
2021-07-11 7:00 ` Leo Prikler
2021-07-15 7:21 ` Chris Marusich
2021-07-15 11:46 ` bug#49329: " Leo Prikler
2021-07-11 4:52 ` [bug#49329] " Chris Marusich
2021-07-11 7:03 ` Leo Prikler
2021-07-15 7:22 ` Chris Marusich
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=20210702135818.16084-3-leo.prikler@student.tugraz.at \
--to=leo.prikler@student.tugraz.at \
--cc=49329@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).