all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 49329@debbugs.gnu.org
Subject: [bug#49329] [PATCH v2 5/5] gnu: Add python-pygame-sdl2.
Date: Sat,  3 Jul 2021 11:28:43 +0200	[thread overview]
Message-ID: <20210703092842.32189-5-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at>

* gnu/packages/game-development.scm (python-pygame-sdl2): New variable.
Inherit package definition from previous python2-pygame-sdl2, with the
following additions:
[source]: Also drop “gen3” in snippet.
[arguments]: Drop #:python.
[native-inputs]: Use ‘python-cython’ instead of ‘python2-cython’.
(python2-pygame-sdl2): Define in terms of python-pygame-sdl2.
---
 gnu/packages/game-development.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5d5fa5cf8b..e1593c0f82 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1106,12 +1106,12 @@ to create fully featured games and multimedia programs in the python language.")
 (define-public python2-pygame
   (package-with-python2 python-pygame))
 
-(define-public python2-pygame-sdl2
+(define-public python-pygame-sdl2
   (let ((real-version "2.1.0")
         (renpy-version "7.4.6"))
     (package
-      (inherit python2-pygame)
-      (name "python2-pygame-sdl2")
+      (inherit python-pygame)
+      (name "python-pygame-sdl2")
       (version (string-append real-version "-for-renpy-" renpy-version))
       (source
        (origin
@@ -1124,12 +1124,12 @@ to create fully featured games and multimedia programs in the python language.")
           '(begin
              ;; drop generated sources
              (delete-file-recursively "gen")
+             (delete-file-recursively "gen3")
              (delete-file-recursively "gen-static")
              #t))))
       (build-system python-build-system)
       (arguments
        `(#:tests? #f                ; tests require pygame to be installed first
-         #:python ,python-2
          #:phases
          (modify-phases %standard-phases
            (add-after 'set-paths 'set-sdl-vars
@@ -1149,7 +1149,7 @@ to create fully featured games and multimedia programs in the python language.")
        `(("sdl-union"
           ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
       (native-inputs
-       `(("python2-cython" ,python2-cython)))
+       `(("python-cython" ,python-cython)))
       (home-page "https://www.renpy.org/")
       (synopsis "Reimplementation of the Pygame API using SDL2")
       (description "Pygame_SDL2 reimplements the Pygame API using SDL2,
@@ -1158,6 +1158,9 @@ While it aims to be used as a drop-in replacement, it appears to be
 developed mainly for Ren'py.")
       (license (list license:lgpl2.1 license:zlib)))))
 
+(define-public python2-pygame-sdl2
+  (package-with-python2 python-pygame-sdl2))
+
 (define-public python2-renpy
   (package
     (name "python2-renpy")
-- 
2.32.0





  parent reply	other threads:[~2021-07-03  9:31 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   ` [bug#49329] [PATCH 3/4] gnu: python2-renpy: Correct inputs Leo Prikler
2021-07-02 13:58   ` [bug#49329] [PATCH 4/4] gnu: renpy: " 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   ` Leo Prikler [this message]
2021-07-11  4:44     ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210703092842.32189-5-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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.