[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/22: python: Fix reference to input when cross-compiling.
From: |
guix-commits |
Subject: |
11/22: python: Fix reference to input when cross-compiling. |
Date: |
Wed, 14 Jul 2021 13:20:50 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit aec20fae9747c541d2ff1512fe52f26428a89c02
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Jul 14 13:12:56 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)
- 15/22: openssl: Move documentation instead of copying and deleting it., (continued)
- 15/22: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/14
- 19/22: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/14
- 16/22: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/14
- 04/22: utils: Define a target-x86-32? and target-x86-64? predicate., guix-commits, 2021/07/14
- 01/22: utils: Define 'target-linux?' predicate., guix-commits, 2021/07/14
- 03/22: utils: Give 'target-mingw?' a docstring., guix-commits, 2021/07/14
- 08/22: libgpg-error: Remove trailing #f from phases., guix-commits, 2021/07/14
- 10/22: libgpg-error: Fix cross-compilation error., guix-commits, 2021/07/14
- 18/22: glib: Use a correct python in scripts when cross-compiling., guix-commits, 2021/07/14
- 17/22: openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., guix-commits, 2021/07/14
- 11/22: python: Fix reference to input when cross-compiling.,
guix-commits <=
- 12/22: openssl: Remove trailing #t from phases., guix-commits, 2021/07/14
- 13/22: openssl: Make the #:phases argument a G-expression., guix-commits, 2021/07/14
- 22/22: build-system/meson: Support cross-compilation., guix-commits, 2021/07/14