guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

09/20: python: Fix reference to input when cross-compiling.


From: guix-commits
Subject: 09/20: python: Fix reference to input when cross-compiling.
Date: Mon, 12 Jul 2021 11:15:42 -0400 (EDT)

mothacehe pushed a commit to branch wip-meson
in repository guix.

commit b2472c3973f611232ad2874e1bea67d71ebc6fde
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Jul 11 13:47:12 2021 +0200

    python: Fix reference to input when cross-compiling.
    
    "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'.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 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 227c612..ef47e79 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -110,13 +110,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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]