From patchwork Fri Jul 2 13:58:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31040 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77BDE27BC81; Fri, 2 Jul 2021 14:59:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 293BD27BC78 for ; Fri, 2 Jul 2021 14:59:24 +0100 (BST) Received: from localhost ([::1]:56530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhT-0004mW-4o for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 09:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0004lA-M4 for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0002KC-EU for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzJh8-0000rV-Ew for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.16252343203261 (code B ref 49329); Fri, 02 Jul 2021 13:59:02 +0000 Received: (at 49329) by debbugs.gnu.org; 2 Jul 2021 13:58:40 +0000 Received: from localhost ([127.0.0.1]:36836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgl-0000qS-Jy for submit@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgh-0000po-Ho for 49329@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:38 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GGcB03P4Wz1LXt4 for <49329@debbugs.gnu.org>; Fri, 2 Jul 2021 15:58:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GGcB03P4Wz1LXt4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625234312; bh=r5yNDmAn9XiqLGr/D0Ac28GU5AV0qm5+5HakMyrZvI8=; h=From:To:Subject:Date:From; b=W/Bl0n8a/fbNpRLBW4gtsA8wRA5Qr+cEUsN3+zWAQRWYBKywjNVaXmB7j78fV0L7z 2HaG8vmL7FLsfdbWG86nhluBIlhfJXPLy9NJPxP62FUapbtrC8Aj13DWuGhuf67O7j oGaMjQomSU0D2HrOUOmSLA5FOgQlNHoX7CU+axFQ= From: Leo Prikler Date: Fri, 2 Jul 2021 15:58:15 +0200 Message-Id: <20210702135818.16084-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches These sources are written in Ren'py (the language) and thus not particularly useful before renpy itself is built. In particular, they serve no purpose when installed without prior compilation. * gnu/packages/game-development.scm (python2-renpy)[#:phases]: Drop installed "common" folder. (renpy)[#:phases]: Adjust comment accordingly. --- gnu/packages/game-development.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9069b88d0c..22c44a585c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1230,7 +1230,8 @@ developed mainly for Ren'py.") (with-directory-excursion "module" (apply (assoc-ref %standard-phases 'install) args)) (copy-recursively "renpy" - (string-append out site "/renpy"))) + (string-append out site "/renpy")) + (delete-file-recursively (string-append out site "/renpy/common"))) #t))))) (inputs `(("ffmpeg" ,ffmpeg) @@ -1304,11 +1305,14 @@ modules of Ren'py.") ;; After finishing this step, "out" will have the following: ;; |-- bin/renpy ;; `-- share/renpy ; i.e. path_to_renpy_base() - ;; `-- common + ;; |-- common + ;; `-- gui ;; - ;; Note that common is also a de facto unused directory in - ;; python2-renpy. On other systems, renpy_base would point to - ;; site-packages or even somewhere in /opt. + ;; Note that common shares the source files that would be installed + ;; by python2-renpy (which are instead deleted from that package), + ;; but also contains their byte-compiled versions. + ;; On other systems, renpy_base would point to site-packages or + ;; even somewhere in /opt. ;; The former approach is not as straightforward as it seems ;; -- it causes renpy to load files twice for some weird reason -- ;; and the latter is impossible on Guix. Hence the detour through @@ -1319,9 +1323,11 @@ modules of Ren'py.") ;; well. This differs from the traditional layout, which is ;; roughly the following: ;; `-- Super Awesome Game - ;; |-- game ; <- the folder we actually want - ;; |-- lib ; compiled renpy module and dependencies - ;; |-- renpy ; Ren'py python code (source + compiled) + ;; |-- game ; <- the folder we actually want + ;; |-- lib ; compiled renpy module and dependencies + ;; |-- renpy ; yet another copy of Ren'py's code + ;; | |-- common ; the common folder from above + ;; | `-- ... ; Python code (source + compiled) ;; |-- Super Awesome Game.py ;; `-- Super Awesome Game.sh (let* ((out (assoc-ref outputs "out")) From patchwork Fri Jul 2 13:58:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31038 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EEC327BC81; Fri, 2 Jul 2021 14:59:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 151FC27BC78 for ; Fri, 2 Jul 2021 14:59:15 +0100 (BST) Received: from localhost ([::1]:56510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhF-0004lS-HM for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 09:59:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0004ku-7y for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0002Jy-0Y for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzJh7-0000rF-Lu for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH 2/4] gnu: python2-renpy: Update description. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 13:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.16252343183237 (code B ref 49329); Fri, 02 Jul 2021 13:59:01 +0000 Received: (at 49329) by debbugs.gnu.org; 2 Jul 2021 13:58:38 +0000 Received: from localhost ([127.0.0.1]:36831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgk-0000q7-37 for submit@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:38 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:52785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgh-0000pq-KO for 49329@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:37 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GGcB14qCtz1LZW9 for <49329@debbugs.gnu.org>; Fri, 2 Jul 2021 15:58:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GGcB14qCtz1LZW9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625234313; bh=nANYCQgDug04g5rFTR1sA9gKOTwQB1UH8kSbbn8r/pw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Be3Xx8wvnPSsgRJUCkFbsbUCQyyiE9srSdpcgdn3ZAjTo4VybCbrBtT2VOrtIJSS6 38+6PgItB6DB7MvczP/WEzZy8qEHrFVbMh7/ZrPoY4Fx2cR40Ndm7Vh7aEWeQqc/tF /X4ldnQ0c+XSwCok7TUrkulc3CaMv+u1ZLA9g8fE= From: Leo Prikler Date: Fri, 2 Jul 2021 15:58:16 +0200 Message-Id: <20210702135818.16084-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702135818.16084-1-leo.prikler@student.tugraz.at> References: <20210702135818.16084-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python2-renpy)[description]: Mention, that it's only used for bootstrapping renpy. --- gnu/packages/game-development.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 22c44a585c..9b231ad333 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1250,8 +1250,10 @@ developed mainly for Ren'py.") ("xdg-utils" ,xdg-utils))) (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") - (description "This package contains the shared libraries and Python -modules of Ren'py.") + (description "This package contains the shared libraries and Python modules +of Ren'py. While functional, they are not meaningful on their own without +the launcher and common Ren'py code provided by the @code{renpy} package and +are only used to bootstrap it.") (license license:expat))) (define-public renpy From patchwork Fri Jul 2 13:58:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31039 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DECD827BC81; Fri, 2 Jul 2021 14:59:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 98E9027BC78 for ; Fri, 2 Jul 2021 14:59:16 +0100 (BST) Received: from localhost ([::1]:56512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhL-0004lX-Lk for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 09:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0004kv-8a for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0002Jz-1Q for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzJh8-0000rM-1t for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH 3/4] gnu: python2-renpy: Correct inputs. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.16252343193255 (code B ref 49329); Fri, 02 Jul 2021 13:59:02 +0000 Received: (at 49329) by debbugs.gnu.org; 2 Jul 2021 13:58:39 +0000 Received: from localhost ([127.0.0.1]:36834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgl-0000qQ-Aa for submit@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:8074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgj-0000pt-36 for 49329@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:37 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GGcB30lHDz1LZWB for <49329@debbugs.gnu.org>; Fri, 2 Jul 2021 15:58:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GGcB30lHDz1LZWB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625234315; bh=Ycr2IQssYLQZ0/LJO/vvIHi3XUiaKR79eZCG4OsUlB4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hOKrkM2nBIBUHxbGwISe4gmH1R7MQjYBG0VTla+K+KS+Axp61f0ZIjsWyOkBMak89 1U2G41SbN8Y8YLlgj3QgNwkYljKvo/0zOgluUTgy+R+9OZm7KtWP2K4YkQyM/MEj7M GcjwfttpeEXqeYQV83dh8nPFpgPGPXF5Cf57NwQo= From: Leo Prikler Date: Fri, 2 Jul 2021 15:58:17 +0200 Message-Id: <20210702135818.16084-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702135818.16084-1-leo.prikler@student.tugraz.at> References: <20210702135818.16084-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (python2-renpy)[#:phases]: Search for ‘xdg-open’ in inputs. : 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 From patchwork Fri Jul 2 13:58:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31041 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB91B27BC81; Fri, 2 Jul 2021 14:59:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B1A5E27BC78 for ; Fri, 2 Jul 2021 14:59:33 +0100 (BST) Received: from localhost ([::1]:56622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhc-0004qU-Qt for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 09:59:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzJh9-0004lI-DO for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzJh9-0002KY-67 for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzJh8-0000rc-S5 for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH 4/4] gnu: renpy: Correct inputs. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.16252343223271 (code B ref 49329); Fri, 02 Jul 2021 13:59:02 +0000 Received: (at 49329) by debbugs.gnu.org; 2 Jul 2021 13:58:42 +0000 Received: from localhost ([127.0.0.1]:36838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgo-0000qg-1f for submit@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:42 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgk-0000q9-K9 for 49329@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:39 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GGcB443Pxz1LZWn for <49329@debbugs.gnu.org>; Fri, 2 Jul 2021 15:58:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GGcB443Pxz1LZWn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625234316; bh=vrUaaG1fXhNhDOq9hmM/m+xmUmqF0kxH5AbZL969yfY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TNAU48daRB0QeOxOREqFTp51/SzGz0ib8MmobHfWBGjHbgl+Y2tYwtJslYHfOluWX Dk1Zae5pFkpsjD0IcBF9wDbN0weDl4jJ2QcwyoHG/VFagtjBnCwemaJl9+zAiBYLyk JEa0PQ9A7ejmnxOSE0ExC9rdrzhdJXc5T1ogtp2s= From: Leo Prikler Date: Fri, 2 Jul 2021 15:58:18 +0200 Message-Id: <20210702135818.16084-4-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702135818.16084-1-leo.prikler@student.tugraz.at> References: <20210702135818.16084-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (renpy)[#:modules]: Add SRFI-1. [#:imported-modules]: Likewise. [#:phases]: Search for ‘python2’ and ‘xdg-open’ in inputs. : Search for ‘xorg-server’ in native-inputs. : Search for ‘python2’ in inputs. : Search for python dependencies in inputs. [inputs]: Add python2, drop python2-pygame (already propagated by python2-renpy). Move xorg-server from here… [native-inputs]: … to here. [propagated-inputs]: Empty. --- gnu/packages/game-development.scm | 54 +++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7c5d45c412..5d5fa5cf8b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1266,15 +1266,22 @@ are only used to bootstrap it.") (arguments `(#:tests? #f ; see python2-renpy #:python ,python-2 + #:modules ((srfi srfi-1) + (guix build python-build-system) + (guix build utils)) + #:imported-modules ((srfi srfi-1) ,@%python-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-commands - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "launcher/game/choose_directory.rpy" - (("/usr/bin/python") (which "python2"))) + (("/usr/bin/python") + (string-append (assoc-ref inputs "python2") + "/bin/python2"))) (substitute* "launcher/game/front_page.rpy" (("xdg-open") - (which "xdg-open"))) + (string-append (assoc-ref inputs "xdg-utils") + "/bin/xdg-open"))) (substitute* "launcher/game/project.rpy" (("cmd = \\[ executable, \"-EO\", sys.argv\\[0\\] \\]") (string-append "cmd = [ \"" (assoc-ref outputs "out") @@ -1291,8 +1298,9 @@ are only used to bootstrap it.") ((", \"game\",") ",")) #t)) (add-before 'build 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref (or native-inputs inputs) + "xorg-server"))) (setenv "HOME" (getcwd)) (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1") @@ -1344,7 +1352,8 @@ are only used to bootstrap it.") (call-with-output-file bin/renpy (lambda (port) - (format port "#!~a~%" (which "python2")) + (format port "#!~a/bin/python2~%" + (assoc-ref inputs "python2")) (format port " from __future__ import print_function @@ -1433,15 +1442,32 @@ if __name__ == \"__main__\": #t)) (replace 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/renpy") - `("PYTHONPATH" = (,(getenv "PYTHONPATH")))) - #t))))) + (let ((out (assoc-ref outputs "out")) + (site (string-append "/lib/python" + (python-version + (assoc-ref inputs "python")) + "/site-packages"))) + (wrap-program (string-append out "/bin/renpy") + `("PYTHONPATH" = + (,@(delete-duplicates + (map + (lambda (store-path) + (string-append store-path site)) + (cons (assoc-ref outputs "out") + (map cdr + (filter + (lambda (input) + (string-prefix? "python2" (car input))) + inputs)))))))) + #t)))))) (inputs - `(("python2-tkinter" ,python-2 "tk") - ("python2-pygame" ,python2-pygame-sdl2) - ("python2-renpy" ,python2-renpy) - ("xorg-server" ,xorg-server))) + `(("python2-renpy" ,python2-renpy) + ("python2-tkinter" ,python-2 "tk") + ("python2" ,python-2) ; for ‘fix-commands’ and ‘wrap’ + ("xdg-utils" ,xdg-utils))) + (propagated-inputs '()) + (native-inputs + `(("xorg-server" ,xorg-server-for-tests))) (outputs (list "out" "tutorial" "the-question")) (home-page "https://www.renpy.org/")