From patchwork Fri Apr 16 11:07:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28588 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 5A0F427BC77; Fri, 16 Apr 2021 12:08:15 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 90D4C27BC6C for ; Fri, 16 Apr 2021 12:08:14 +0100 (BST) Received: from localhost ([::1]:56498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXMKb-0002Ng-QU for patchwork@mira.cbaines.net; Fri, 16 Apr 2021 07:08:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXMKR-0002Kl-OD for guix-patches@gnu.org; Fri, 16 Apr 2021 07:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXMKR-0004ER-95 for guix-patches@gnu.org; Fri, 16 Apr 2021 07:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXMKR-0001yG-4X for guix-patches@gnu.org; Fri, 16 Apr 2021 07:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH 3/3] gnu: tsukundere: Update to 0.3.0. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Apr 2021 11:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47824@debbugs.gnu.org Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.16185712677540 (code B ref 47824); Fri, 16 Apr 2021 11:08:03 +0000 Received: (at 47824) by debbugs.gnu.org; 16 Apr 2021 11:07:47 +0000 Received: from localhost ([127.0.0.1]:40153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXMKB-0001xX-4X for submit@debbugs.gnu.org; Fri, 16 Apr 2021 07:07:47 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:21046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXMK6-0001xG-NH for 47824@debbugs.gnu.org; Fri, 16 Apr 2021 07:07:43 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMD2N02Gtz1LBRx for <47824@debbugs.gnu.org>; Fri, 16 Apr 2021 13:07:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMD2N02Gtz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618571260; bh=ZtWWy1O579ZY2fcWkNqHoFGehv8DG7LMZ9PkYhkIjXQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gsVfPc2g8T0nAwuOHeyCd3XqLjR8O68Y7U+DAkh2UGuv1ec+Kj7Dj5QKFS5PZ9KAY iNOlHNi4Z8js3zdSKLabnIrwAheYyxju/wIJpwFJhoMdoRpX5OvMkIcktUPSBZtVGN Bq8DF7jyvQkC1bt0SsVwcHA/e0AjaXXSi28C7YZc= From: Leo Prikler Date: Fri, 16 Apr 2021 13:07:23 +0200 Message-Id: <20210416110723.9938-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210416110723.9938-1-leo.prikler@student.tugraz.at> References: <20210416110723.9938-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.117 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 (tsukundere): Update to 0.3.0. [patch-command]: Patch path to guile. Construct load paths directly from inputs. [propagated-inputs]: Remove. [inputs]: Add guile (as guile-runtime) and guile-sdl2. --- gnu/packages/game-development.scm | 45 +++++++++++++++++++------------ 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0d4855d275..98ef88971a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -493,7 +493,7 @@ clone.") (define-public tsukundere (package (name "tsukundere") - (version "0.2.3") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -502,10 +502,11 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 - "05ckds2df810441wfavllx9lsw5jsc9h3nb7m31df01nsj56azdw")))) + "06jiaylbnx8khicsaq2gwnd8wspjhjymbb5z6x5445krklk0jx18")))) (build-system gnu-build-system) (arguments - `(#:modules (((guix build guile-build-system) + `(#:modules ((srfi srfi-1) + ((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%gnu-build-system-modules) #:imported-modules ((guix build guile-build-system) @@ -513,22 +514,31 @@ clone.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-command - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (version (target-guile-effective-version)) - (scm (string-append out "/share/guile/site/" - version)) - (go (string-append out "/lib/guile/" - version "/site-ccache"))) - + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((version (target-guile-effective-version)) + (scm (lambda (in) + (string-append in "/share/guile/site/" + version))) + (go (lambda (in) + (string-append in "/lib/guile/" version + "/site-ccache"))) + (pkgs + (cons + (assoc-ref outputs "out") + (filter-map + (lambda (input) + (and (string-prefix? "guile-" (car input)) (cdr input))) + inputs)))) (substitute* "bin/tsukundere" - (("exec guile .*" all) + (("exec guile (.*)" _ args) (string-append (format #f "export GUILE_LOAD_PATH=~@?~%" - "\"~a:~a\"" scm (getenv "GUILE_LOAD_PATH")) + "\"~{~a~^:~}\"" (map scm pkgs)) (format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%" - "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH")) - all))) + "\"~{~a~^:~}\"" (map go pkgs)) + "exec " + (assoc-ref inputs "guile-runtime") + "/bin/guile " args))) #t)))))) (native-inputs `(("autoconf" ,autoconf) @@ -536,8 +546,9 @@ clone.") ("guile" ,guile-3.0) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (propagated-inputs - `(("guile-sdl2" ,guile3.0-sdl2))) + (inputs + `(("guile-sdl2" ,guile3.0-sdl2) + ("guile-runtime" ,guile-3.0))) (home-page "https://gitlab.com/leoprikler/tsukundere") (synopsis "Visual novel engine") (description "Tsukundere is a game engine geared heavily towards the