From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id COhdFsIb32AdMgEAgWs5BA (envelope-from ) for ; Fri, 02 Jul 2021 15:59:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aDAUEsIb32DPYgAA1q6Kng (envelope-from ) for ; Fri, 02 Jul 2021 13:59:30 +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 C92FD28C07 for ; Fri, 2 Jul 2021 15:59:29 +0200 (CEST) Received: from localhost ([::1]:56512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhY-0004lX-S5 for larch@yhetil.org; Fri, 02 Jul 2021 09:59:28 -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 Content-Type: text/plain; charset=UTF-8 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.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+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=1625234369; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=Ycr2IQssYLQZ0/LJO/vvIHi3XUiaKR79eZCG4OsUlB4=; b=AMkzlR6Ljk5D2/4zAsSNIjQv0oBij3EMkTIQUBA1MfNoVQUsG9kMnVCidgv+tPYLv2fdk7 D9FBzYPlONu3p0O9UmIEi9yGYbS3Z9ylkO1Yp4r6EapSI5RICd0E2wKK+nrxGR7obeybht pkXKNFzU3Cge/48eBt5OPQrO16DXpWq5V7rtB3cyqC91WZphge5hBUzAOAKy28GUgyHHao ToGF+Uds0zg0vFPiVlFMv0VtNWXD1rZ8UiXBTm/5Z/x0YKCsLSmE5ZzlxbAnApM6ztKrDW MRZyKMeagexiEouAJengrMo8BCXVNawsqzZ0uBRehGg4nb5ahNijOzzloVKiBQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625234369; a=rsa-sha256; cv=none; b=dGpLN4t/705c3THX5AYi00PPzB2RHnJ4+3VkDLDpWDK8FKG38debg9E2EEsLbGDR8DQwvZ YmRY4LaEZio2rYHb1U2fVFFkGcG3vdQfW4TrBPYEZYRU2mxc8u9hTMe6Oy9xaVDTYILEIS SIcUazXPoyM6q9H1nfGuX/GPvZhLT+Yyr575L1a+VXCClU7/PTolNbl/oewPp2YTzXISzN kVC+UcmRvhBtWoC3k+or9HJsFKuE0avDDUw4wtD0uCymNtNQa2/hxfeveJmqDuy2/C9m1m 73QjxXewx6UO09izGmnUKWecWosAAuMFzYVv3IziWy4nLkvIEX5oDnjX8hKO2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=hOKrkM2n; 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-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=hOKrkM2n; 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: C92FD28C07 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: 58PRQK1l9jeh * 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 -- 2.32.0