From patchwork Fri Jun 18 16:09:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30395 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 806B227BC81; Fri, 18 Jun 2021 17:15:53 +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 5419827BC78 for ; Fri, 18 Jun 2021 17:15:53 +0100 (BST) Received: from localhost ([::1]:50908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH9s-0001Gi-CE for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:15:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5N-0000ae-24 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46308) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5M-0002Bw-Qs for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5M-00030Z-N9 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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: Fri, 18 Jun 2021 16:11:12 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403264811300 (code B ref 49025); Fri, 18 Jun 2021 16:11:12 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:48 +0000 Received: from localhost ([127.0.0.1]:57815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4x-0002w6-MU for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:47 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4V-0002q5-9S for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:28 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAJND; Fri, 18 Jun 2021 18:10:19 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:14 +0200 Message-Id: <20210618160936.18972-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032619; bh=PDI+BmIWM67CqaekPjoSL4qQbhEt3DyB5sTW2X9yYys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=gKqdZ+3wSa8yjEDIXEu83M6j51TMlIlUmoGPUYt1eHW2lgJuzZjA6GP2tU/GtglGS 9KcXvp/QpXDSIKGEV4v5Mh90mf/QGt0bL0lMYXemAM6A6KyXrjKo1fAAQD4y9J93Dk +jCihS6APeyK6qge+srpVdqdzyLZvJOriMpEYC4mo++t5bdTfmgj7RLk+301TpcTgL d2Wg8CDvNGLtzVOf6RXDB5sDdb8YmvMCGBNdslHTOt628+RSDfHysUnh+5HjxcjgGM bTMIXUePRaYgfumAJXZ6e8YojX2E9ehSpKdM/yKutxyywkzAJcK72/uaw2EosCqPE9 W88eJar7K6RTA== 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: , Reply-To: 49025@debbugs.gnu.org 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)