From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UIpMKWMu4GCjHQAAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 11:31:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id yA8NJWMu4GBKJwAAB5/wlQ (envelope-from ) for ; Sat, 03 Jul 2021 09:31:15 +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 595AE18CAD for ; Sat, 3 Jul 2021 11:31:15 +0200 (CEST) Received: from localhost ([::1]:59302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzbzW-0005qc-CK for larch@yhetil.org; Sat, 03 Jul 2021 05:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005oM-T1 for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzbzK-0005O2-Lg for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzbzK-00057R-Jn for guix-patches@gnu.org; Sat, 03 Jul 2021 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH v2 3/5] gnu: python2-renpy: Correct inputs. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 09:31: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.162530463519612 (code B ref 49329); Sat, 03 Jul 2021 09:31:02 +0000 Received: (at 49329) by debbugs.gnu.org; 3 Jul 2021 09:30:35 +0000 Received: from localhost ([127.0.0.1]:37940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbys-000568-9W for submit@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:35 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:43821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzbyd-00055H-Qn for 49329@debbugs.gnu.org; Sat, 03 Jul 2021 05:30:21 -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 4GH6B147lNz1LXt0 for <49329@debbugs.gnu.org>; Sat, 3 Jul 2021 11:30:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GH6B147lNz1LXt0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625304617; bh=Ycr2IQssYLQZ0/LJO/vvIHi3XUiaKR79eZCG4OsUlB4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gO+/5ESXmHd3s/bL2HdEKW483fORQVNOzzCWX7VZOwSonqQm29pJ5i4jNnEeut3KM lX0EGuOuDiv6Btd/4Olq+2yBcPdjryZGdFlPZkzL0Fmrxn5ojTyZpkU5viNzBfzxtP xs5bhtB3d5CrYD/zdSKGmgqGQ1l1a/7XKJmp4+UU= From: Leo Prikler Date: Sat, 3 Jul 2021 11:28:41 +0200 Message-Id: <20210703092842.32189-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210703092842.32189-1-leo.prikler@student.tugraz.at> References: <20210703092842.32189-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.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=1625304675; 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=UManplOqw7+KvtxrhC3V10nWFwA/hDgYv0uyJpzhTlRQWW5X/S2mJ/l6GxClf2W40Ovld+ I8STfC1z3KI2PzACb9Dlj6SZXNZqfG4bGVbRakYft8ddY4SOalURqksVNqZDf9Gy4/IRJC rkDbvk+O2mA9MeGfz9QWNpUwZx9sX2O05ARTfDhBhpjMXF//kJg84MpfO6qUOt1jh+ok7m QWHHO9m6UmbaCyb/3BNxX/t8YV1LhQC5a70E9/H150W7G6CulZdZfRGrB9zOesRwu46IVu 48DvH+JWv5vbFRqYVP3Pt0YskopqzbJ54yXuBf4lTJP1GgNQl7CyfEtUjzrESg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625304675; a=rsa-sha256; cv=none; b=Zamh67lDMR7L6T3+ygiEVeRPwqI+lnwnRIUsngMQfid90VkK9p83nwyaBwKYif7bQFrhws 94LeHSntg60ZAW6AGtTTW7vpGv3TRn5T5wBJusj83fiNmfO4Dukmru6QCdp9Vi36t3F751 kaUHXK1AgCHj61WOE8Ey9RFn19i/QMJaBT3eBRgTyJc2y6118RjMwHuENXrGop2afnDJQ6 afk0LOanHZ1rOfzqgNpacCtvm5kBgArJsFpwYw6yT59xGNNAhzuez/YWtlja8IBpzZ2urw SDQ176Pgg9g5uFDx0571sAkxxeAUOhMAoSZ5cuwRc8KFnLwGtQUDSRhEs+KpmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="gO+/5ESX"; 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="gO+/5ESX"; 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: 595AE18CAD X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: V9NBQCMHdK5Q * 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