[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)
- 02/20: utils: Define a target-x86-32? and target-x86-64? predicate., (continued)
- 02/20: utils: Define a target-x86-32? and target-x86-64? predicate., guix-commits, 2021/07/12
- 16/20: glib: Use a correct python in scripts when cross-compiling., guix-commits, 2021/07/12
- 20/20: meson: Support cross-compilation., guix-commits, 2021/07/12
- 06/20: libgpg-error: Remove trailing #f from phases., guix-commits, 2021/07/12
- 08/20: libgpg-error: Fix cross-compilation error., guix-commits, 2021/07/12
- 18/20: glib: Look up "tzdata" in 'native-inputs', not 'inputs'., guix-commits, 2021/07/12
- 10/20: openssl: Remove trailing #t from phases., guix-commits, 2021/07/12
- 17/20: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/12
- 15/20: openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., guix-commits, 2021/07/12
- 07/20: libgpg-error: Prevent silent miscompilation some systems., guix-commits, 2021/07/12
- 09/20: python: Fix reference to input when cross-compiling.,
guix-commits <=
- 13/20: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/12
- 14/20: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/12
- 01/20: utils: Define target-linux? predicate., guix-commits, 2021/07/12
- 12/20: openssl: Use G-exp machinery for referring to outputs., guix-commits, 2021/07/12
- 03/20: packages: Define this-package-input and this-package-native-input., guix-commits, 2021/07/12
- 05/20: tzdata: Don't bother with cross-compiling., guix-commits, 2021/07/12
- 19/20: libelf: Update configure script and config.guess and config.sub., guix-commits, 2021/07/12