From patchwork Mon Jun 14 15:38:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30268 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 C6D7A27BC81; Mon, 14 Jun 2021 17:07:45 +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, FREEMAIL_FROM,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 7A93827BC78 for ; Mon, 14 Jun 2021 17:07:45 +0100 (BST) Received: from localhost ([::1]:51902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp7o-0001o5-IZ for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:07:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp79-0001lM-8I for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp78-0008MF-Vy for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp78-00054r-PL for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 15/37] python: Fix reference to input when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679319443 (code B ref 49025); Mon, 14 Jun 2021 16:07:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:33 +0000 Received: from localhost ([127.0.0.1]:47693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6e-00053R-CA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoft-00049r-9U for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:53 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3es2500L0mfAB4013esdw; Mon, 14 Jun 2021 17:38:52 +0200 Message-ID: <6248f1f47c912ca357fd1c5f390c9007033dade1.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:52 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685133; bh=sxYEjfJFxqzIqdewtxXhkwGSS1U07GxaI+f6QcrtDkQ=; h=Subject:From:To:Date:In-Reply-To:References; b=d6TcwFiICsA1vLcmeKtl8EmmTLcTJmY1KPUk26kovO0ur5pe2UtyU1K1+4wuzHFnw fLDyo3zTOELYGMorz3DmKc7E0Mc7TPcSpRgOkV4z3suUipoiA5gJaDX/YZwi8LxCXT NgKofb3Tp4HBYDOQh1L5q+9zPMLsFyi3zpt2JJNJ+jlTIn57Lt4SNJNatt1oRmxwn9 0rMWqiOSebDE107H8YiqqP6DOj0Rlszx6EPNCrWwQK1zSsN4XUcni3ZFV0kGL7jYiG HsSNMRb5vntekeqjuUykeZPmZJIcF7NYKqGVJuEk4atjPZADzkAbvgla4996++LiV+ 69vR2z2AuX87w== 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 "sitecustomize.py" is a native input, so look it up in 'native-inputs', not 'inputs'. * gnu/packages/python.scm (customize-site): Look up "sizecustomize.py" in 'native-inputs', not 'inputs'. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbad0b65b8..f004b8e739 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -111,13 +111,14 @@ (define* (customize-site version) "Generate a install-sitecustomize.py phase, using VERSION." - `(lambda* (#:key inputs outputs #:allow-other-keys) + `(lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (site-packages (string-append out "/lib/python" ,(version-major+minor version) "/site-packages")) - (sitecustomize.py (assoc-ref inputs "sitecustomize.py")) + (sitecustomize.py (assoc-ref (or native-inputs inputs) + "sitecustomize.py")) (dest (string-append site-packages "/sitecustomize.py"))) (mkdir-p site-packages) (copy-file sitecustomize.py dest)