From: Adam Faiz <liliana.prikler@gmail.com>
To: Adam Faiz <adam.faiz@disroot.org>
Cc: 60153@debbugs.gnu.org
Subject: [bug#60153] [PATCH v2 2/3] gnu: python-pygame: Use G-Expressions and new-style inputs.
Date: Sun, 18 Dec 2022 23:54:22 +0800 [thread overview]
Message-ID: <0a0ec42cff859e92452309eae9cb9e4c02946f92.camel@disroot.org> (raw)
In-Reply-To: <3e37f988-a3ec-ccce-033e-1807fe7859b9@disroot.org>
* gnu/packages/game-development.scm (python-pygame)[arguments]: Convert
to list of G-Expressions.
[inputs]: Drop labels.
---
gnu/packages/game-development.scm | 75 ++++++++++++++++---------------
1 file changed, 38 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 07b2c6f3fe..31bc76d4fd 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1203,46 +1203,47 @@ (define-public python-pygame
"0g6j79naab7583kymf1bgxc5l5c9h5laq887rmvh8vw8iyifrl6n"))))
(build-system python-build-system)
(arguments
- `(#:tests? #f ; tests require pygame to be installed first
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-build-config
- (lambda _
- (substitute* "buildconfig/config_unix.py"
- (("origincdirs = \\[.*\\]")
- "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")")
- (("ORIGLIBDIRS") "LIBRARY_PATH")
- (("incdirs = \\[\\]") "incdirs = origincdirs")
- (("libdirs = \\[\\]") "libdirs = origlibdirs"))))
- (add-after 'unpack 'fix-sdl2-headers
- (lambda _
- (substitute* "buildconfig/config_unix.py"
- (("SDL_ttf.h") "SDL2/SDL_ttf.h")
- (("SDL_image.h") "SDL2/SDL_image.h")
- (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
- (substitute* "src_c/imageext.c"
- (("SDL_image.h") "SDL2/SDL_image.h"))
- (substitute* "src_c/font.h"
- (("SDL_ttf.h") "SDL2/SDL_ttf.h"))
- (substitute* "src_c/mixer.h"
- (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
- (substitute* "src_c/_sdl2/mixer.c"
- (("SDL_mixer.h") "SDL2/SDL_mixer.h")))))))
+ (list
+ #:tests? #f ; tests require pygame to be installed first
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-build-config
+ (lambda _
+ (substitute* "buildconfig/config_unix.py"
+ (("origincdirs = \\[.*\\]")
+ "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")")
+ (("ORIGLIBDIRS") "LIBRARY_PATH")
+ (("incdirs = \\[\\]") "incdirs = origincdirs")
+ (("libdirs = \\[\\]") "libdirs = origlibdirs"))))
+ (add-after 'unpack 'fix-sdl2-headers
+ (lambda _
+ (substitute* "buildconfig/config_unix.py"
+ (("SDL_ttf.h") "SDL2/SDL_ttf.h")
+ (("SDL_image.h") "SDL2/SDL_image.h")
+ (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
+ (substitute* "src_c/imageext.c"
+ (("SDL_image.h") "SDL2/SDL_image.h"))
+ (substitute* "src_c/font.h"
+ (("SDL_ttf.h") "SDL2/SDL_ttf.h"))
+ (substitute* "src_c/mixer.h"
+ (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
+ (substitute* "src_c/_sdl2/mixer.c"
+ (("SDL_mixer.h") "SDL2/SDL_mixer.h")))))))
(native-inputs
(list pkg-config))
(inputs
- `(("freetype" ,freetype)
- ("sdl2" ,sdl2)
- ("sdl2-image" ,sdl2-image)
- ("sdl2-mixer" ,sdl2-mixer)
- ("sdl2-ttf" ,sdl2-ttf)
- ("sdl2-gfx" ,sdl2-gfx)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libX11" ,libx11)
- ("libsmpeg" ,libsmpeg)
- ("portmidi" ,portmidi)
- ("v4l-utils" ,v4l-utils)))
+ (list freetype
+ sdl2
+ sdl2-image
+ sdl2-mixer
+ sdl2-ttf
+ sdl2-gfx
+ libjpeg-turbo
+ libpng
+ libx11
+ libsmpeg
+ portmidi
+ v4l-utils))
(home-page "https://www.pygame.org")
(synopsis "SDL wrapper for Python")
(description "Pygame is a set of Python modules designed for writing games.
--
2.38.1
next prev parent reply other threads:[~2022-12-23 19:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-17 10:01 [bug#60153] [PATCH] gnu: python-pygame: Update to 2.1.2 Adam Faiz via Guix-patches via
[not found] ` <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org>
2022-12-17 10:52 ` [bug#60153] Fwd: " Liliana Marie Prikler
2022-12-18 14:15 ` Adam Faiz via Guix-patches via
2022-12-18 15:02 ` Liliana Marie Prikler
2022-12-18 15:51 ` [bug#60153] [PATCH v1 1/3] " Adam Faiz via Guix-patches via
2022-12-18 15:54 ` [bug#60153] [PATCH v1 2/3] gnu: python-pygame: Use gexps and new style inputs Adam Faiz via Guix-patches via
2022-12-18 15:57 ` [bug#60153] [PATCH v1 3/3] gnu: python-pygame: Fix description Adam Faiz via Guix-patches via
2022-12-18 15:51 ` [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2 Adam Faiz
2022-12-23 23:20 ` Adam Faiz via Guix-patches via
2022-12-23 23:43 ` Adam Faiz via Guix-patches via
2022-12-23 23:54 ` Adam Faiz via Guix-patches via
2022-12-24 5:51 ` Liliana Marie Prikler
2022-12-24 13:19 ` Adam Faiz via Guix-patches via
2022-12-24 5:39 ` Liliana Marie Prikler
2022-12-18 15:54 ` Adam Faiz [this message]
2022-12-22 20:45 ` [bug#60153] [PATCH v2 3/3] gnu: python-pygame: Reword description Liliana Marie Prikler
2022-12-22 21:09 ` [bug#60153] [PATCH v2 0/3] Update python-pygame to 2.1.2 Liliana Marie Prikler
2022-12-31 7:34 ` bug#60153: " Liliana Marie 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=0a0ec42cff859e92452309eae9cb9e4c02946f92.camel@disroot.org \
--to=liliana.prikler@gmail.com \
--cc=60153@debbugs.gnu.org \
--cc=adam.faiz@disroot.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).