From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sFB2OPo8fWCIJQAAgWs5BA (envelope-from ) for ; Mon, 19 Apr 2021 10:19:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gLwqNPo8fWDoRAAAB5/wlQ (envelope-from ) for ; Mon, 19 Apr 2021 08:19:06 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B7D722A69 for ; Mon, 19 Apr 2021 10:19:06 +0200 (CEST) Received: from localhost ([::1]:36066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYP7Z-0006au-O4 for larch@yhetil.org; Mon, 19 Apr 2021 04:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYP7W-0006ao-D6 for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYP7W-0004BL-5v for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYP7W-0001LX-1d for guix-patches@gnu.org; Mon, 19 Apr 2021 04:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47824] [PATCH v2 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: Mon, 19 Apr 2021 08:19:02 +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 Cc: efraim@flashner.co.il Received: via spool by 47824-submit@debbugs.gnu.org id=B47824.16188202865104 (code B ref 47824); Mon, 19 Apr 2021 08:19:02 +0000 Received: (at 47824) by debbugs.gnu.org; 19 Apr 2021 08:18:06 +0000 Received: from localhost ([127.0.0.1]:48336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6Y-0001Jw-Ip for submit@debbugs.gnu.org; Mon, 19 Apr 2021 04:18:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:64527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYP6U-0001JK-Oo for 47824@debbugs.gnu.org; Mon, 19 Apr 2021 04:17:59 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FP0776mdKz1LB21; Mon, 19 Apr 2021 10:17:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FP0776mdKz1LB21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618820276; bh=SrdbEl70xMPkpfMP7S0/2c+KqGjtad6l/Ajbd5G2jnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UwVLYV7GHn/tAuJVp0U/LahQnMPdSMlxffAotiZc4rVTD31nIcdXLvpTplFQtd6zk ajFj407O4pFoTnpysiumQwl5uHCH3oG08yuaidQI+ME5oO7jDlgTcK3e6919RqQzP8 NAbbnMB/kHjIT8yWCTMTlXTVa+3FPJgQnERHSj7A= From: Leo Prikler Date: Mon, 19 Apr 2021 10:17:44 +0200 Message-Id: <20210419081744.7247-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419081744.7247-1-leo.prikler@student.tugraz.at> References: <20210419081744.7247-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618820346; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=SrdbEl70xMPkpfMP7S0/2c+KqGjtad6l/Ajbd5G2jnI=; b=sWT6iM8lPwsafDeDqsFVnMoTkZTEzRVePNWyHyzyQ/jZ8gDPjzd5Yh8S6dvY1jpscr3JYj grVyZBwb8SSXp3IjQ3NG1JwEJgt1o20fE/UmDA7bvRzdyiKCREZDYevwq59s1FoeNP55Oy M7vu9nC9Lq8Ojgot8vq/6AsCvadcYXb437w+RUh/CKifhK9j0C0PcBvrHKwiYzsgH1/HZw fk1tInAaBkXDkp6L2gQcqVGXZ5AtOe1ZcgNHETvbJEnqTQOobNxEM9uhXLr8eyh6+3OjDq RO8WCXvTN/Enw4FRTews5OYz1Z3xZstiTqZghrj8QfYkers4fshHp08sw+9cyA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618820346; a=rsa-sha256; cv=none; b=k3v545RWCUegqW5yujZChQHw4qTSURR2p3ujj76HLORAlWjUvp8eQqpU3CrDHGFs2Pz2Ae NfefgA0NaelH8qH6LVie1M3mdog/avpbPnW4u5RHicpVjiDmcCV1/kbb18DljiGGg2wRos uisdoOXNw+yvVr6wKQlKZbyjQuCYQzVJH0eSTf2VLcwFEG8fAaCu60yKOmAp1P+4bHQRyl wVuqPILt9w/UJqBqgW59hHW7FZlCGOZV+o0CJTn9ZZalj4zxwA21tLb/g7HFMzsEWHK+6h VAkncO9Z2xOJhZ67HbdN42ZUwALN9NvN2vVP5F2qgM8IpIRMI99c2f0JXmqk4g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=UwVLYV7G; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=UwVLYV7G; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8B7D722A69 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4CrWc4mFEpAI * 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 | 51 +++++++++++++++++++------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0d4855d275..ccf1fbdc5d 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,12 @@ 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 ((ice-9 match) + (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 +515,32 @@ 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* ((scm (lambda (in) + (string-append in "/share/guile/site/" + (target-guile-effective-version)))) + (ccache (lambda (in) + (string-append in "/lib/guile/" + (target-guile-effective-version) + "/site-ccache"))) + (pkgs + (cons + (assoc-ref outputs "out") + (filter-map + (match-lambda + ((label . pkg) + (and (string-prefix? "guile-" label) pkg))) + 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")) - (format #f "export GUILE_LOAD_COMPILED_PATH=~@?~%" - "\"~a:~a\"" go (getenv "GUILE_LOAD_COMPILED_PATH")) - all))) + (format #f "export GUILE_LOAD_PATH=\"~@?\"~%" + "\"~{~a~^:~}\"" (map scm pkgs)) + (format #f "export GUILE_LOAD_COMPILED_PATH=\"~@?\"~%" + "\"~{~a~^:~}\"" (map ccache pkgs)) + "exec " + (assoc-ref inputs "guile-runtime") + "/bin/guile " args))) #t)))))) (native-inputs `(("autoconf" ,autoconf) @@ -536,8 +548,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 -- 2.31.1