[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: python2-renpy: Correct inputs.
From: |
guix-commits |
Subject: |
03/07: gnu: python2-renpy: Correct inputs. |
Date: |
Thu, 15 Jul 2021 07:43:13 -0400 (EDT) |
leoprikler pushed a commit to branch master
in repository guix.
commit 3d7dea0906a59ff84308907b1488da52956a614c
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Fri Jul 2 14:46:28 2021 +0200
gnu: python2-renpy: Correct inputs.
* 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 9b231ad..7c5d45c 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
- branch master updated (17c8fed -> a0c4465), guix-commits, 2021/07/15
- 01/07: gnu: python2-renpy: Drop unused Ren'py sources., guix-commits, 2021/07/15
- 02/07: gnu: python2-renpy: Update description., guix-commits, 2021/07/15
- 05/07: gnu: Add python-pygame-sdl2., guix-commits, 2021/07/15
- 07/07: gnu: evince: Build with libkpathsea., guix-commits, 2021/07/15
- 04/07: gnu: renpy: Correct inputs., guix-commits, 2021/07/15
- 03/07: gnu: python2-renpy: Correct inputs.,
guix-commits <=
- 06/07: gnu: Add texlive-libkpathsea., guix-commits, 2021/07/15