From patchwork Sun Oct 20 12:09:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 15776 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 5C926175DF; Sun, 20 Oct 2019 13:11:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AF960175DD for ; Sun, 20 Oct 2019 13:11:13 +0100 (BST) Received: from localhost ([::1]:32914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMA3F-0004Vq-9N for patchwork@mira.cbaines.net; Sun, 20 Oct 2019 08:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40091) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMA36-0004VP-RZ for guix-patches@gnu.org; Sun, 20 Oct 2019 08:11:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMA34-0003HV-JP for guix-patches@gnu.org; Sun, 20 Oct 2019 08:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMA34-0003HO-44 for guix-patches@gnu.org; Sun, 20 Oct 2019 08:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iMA33-0000W0-Tm for guix-patches@gnu.org; Sun, 20 Oct 2019 08:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37714] Add renpy package Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Oct 2019 12:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Nicolas Goaziou Cc: 37714@debbugs.gnu.org Received: via spool by 37714-submit@debbugs.gnu.org id=B37714.15715734101916 (code B ref 37714); Sun, 20 Oct 2019 12:11:01 +0000 Received: (at 37714) by debbugs.gnu.org; 20 Oct 2019 12:10:10 +0000 Received: from localhost ([127.0.0.1]:53977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMA26-0000Ue-Vv for submit@debbugs.gnu.org; Sun, 20 Oct 2019 08:10:10 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:47928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMA22-0000U9-QS for 37714@debbugs.gnu.org; Sun, 20 Oct 2019 08:10:01 -0400 Received: from nijino.local (194-118-175-91.hdsl.highway.telekom.at [194.118.175.91]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 46wz9F1LDkz3wP4; Sun, 20 Oct 2019 14:09:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1571573394; bh=Lkp7NCuwQFUaYIrViUQG74qFKh09SnTDhmjuttNxm5c=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=lCfPA4f3BjNV25rFMPdSdd80VEVriahO9RZVhtPDZ1gOcdmDXHK27UfdpxhEuIiX7 NARF1XSGHmqLkimDxJU9COEhxL7GqApiQ/i9Ugu2o49V5Ib8dUxeMuV8S5393YPIwz aewf2h8Cn21DmAQ3nVuSlZKSyE8Mm70dz4WxDg1o= Message-ID: From: Leo Prikler Date: Sun, 20 Oct 2019 14:09:54 +0200 In-Reply-To: References: <87d0et96lm.fsf@nicolasgoaziou.fr> User-Agent: Evolution 3.30.5 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Am Samstag, den 19.10.2019, 22:59 +0200 schrieb Leo Prikler: > - 0003 splits renpy into the python package python2-renpy and the > program itself. This makes the build rules a little easier to read, > even if they themselves did not change much. Now also with a package description for python2-renpy. > - 0004 fixes the launcher (mostly). One can now set a project > directory, create projects, launch created projects and open project > directories in the default file explorer. However, setting the editor > (and hence launching one) still does not work. Adjusted accordingly. - 0005 uses pre-install renpy to compile the games. I've also updated the comments on #:tests? that are inaccurate as of 0002. Regards, Leo From 9866ea5245979ccb61a0a71499e268b0234d92ff Mon Sep 17 00:00:00 2001 From: Comrade Yuri Date: Sun, 20 Oct 2019 14:02:19 +0200 Subject: [PATCH 5/5] gnu: compile Ren'py games * /gnu/packages/game-development: (python2-renpy) [arguments]: Update comment on #:tests? (renpy) [arguments]: Ditto. [start-xserver]: New phase. [build]: New phase. [inputs]: Add xorg-server. --- gnu/packages/game-development.scm | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a57cddfbcb..10111ebf1c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1033,7 +1033,7 @@ developed mainly for Ren'py.") (sha256 (base32 "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4")))) (build-system python-build-system) (arguments - `(#:tests? #f ; non-trivial tests require a more complete Ren'py + `(#:tests? #f ; Ren'py doesn't seem to package tests #:python ,python-2 #:phases (modify-phases %standard-phases @@ -1066,7 +1066,6 @@ developed mainly for Ren'py.") (invoke "python" "-m" "compileall" "renpy")) (getcwd) args) #t)) - (replace 'install (lambda args (apply @@ -1110,9 +1109,7 @@ of renpy.") (version "7.3.5") (build-system python-build-system) (arguments - `(;; TODO: We currently can't run renpy inside the guixbuilder. - ;; Perhaps we should set up an X server. - #:tests? #f + `(#:tests? #f ; see python2-renpy #:python ,python-2 #:phases (modify-phases %standard-phases @@ -1138,8 +1135,19 @@ of renpy.") "launcher/game/gui7/images.py") ((", \"game\",") ",")) #t)) - ;; TODO: Here we would use ren'py to compile the games. - (delete 'build) + (add-before 'build 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (setenv "HOME" (getcwd)) + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + #t))) + (replace 'build + (lambda _ + (invoke "python" "renpy.py" "launcher" "quit") + (invoke "python" "renpy.py" "the_question" "quit") + (invoke "python" "renpy.py" "tutorial" "quit") + #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) ;; Here we install our custom renpy program. @@ -1272,7 +1280,8 @@ if __name__ == \"__main__\": (inputs `(("python2-tkinter" ,python-2 "tk") ("python2-pygame" ,python2-pygame-sdl2) - ("python2-renpy" ,python2-renpy))) + ("python2-renpy" ,python2-renpy) + ("xorg-server" ,xorg-server))) (outputs (list "out" "tutorial" "the-question")) (home-page "http://www.renpy.org/") -- 2.23.0