[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [[PATCH v2 core-updates] 13/37] wrap-python3: Make #:builder
From: |
Maxime Devos |
Subject: |
[bug#49025] [[PATCH v2 core-updates] 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp. |
Date: |
Fri, 18 Jun 2021 18:09:12 +0200 |
This allows using ungexp later.
* gnu/packages/python.scm (wrap-python3)<#:builder>: Make this
a G-expression.
---
gnu/packages/python.scm | 46 ++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b2ec486d7a..9628836567 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -573,29 +573,29 @@ for more information.")))
(arguments
`(#:modules ((guix build utils))
#:builder
- (begin
- (use-modules (guix build utils))
- (let ((bin (string-append (assoc-ref %outputs "out") "/bin"))
- (python (string-append (assoc-ref %build-inputs "python")
"/bin/")))
- (mkdir-p bin)
- (for-each
- (lambda (old new)
- (symlink (string-append python old)
- (string-append bin "/" new)))
- `("python3" ,"pydoc3" ,"idle3" ,"pip3")
- `("python" ,"pydoc" ,"idle" ,"pip"))
- ;; python-config outputs search paths based upon its location,
- ;; use a bash wrapper to avoid changing its outputs.
- (let ((bash (string-append (assoc-ref %build-inputs "bash")
- "/bin/bash"))
- (old (string-append python "python3-config"))
- (new (string-append bin "/python-config")))
- (with-output-to-file new
- (lambda ()
- (format #t "#!~a~%" bash)
- (format #t "exec \"~a\" \"$@\"~%" old)
- (chmod new #o755)
- #t)))))))
+ ,#~(begin
+ (use-modules (guix build utils))
+ (let ((bin (string-append (assoc-ref %outputs "out") "/bin"))
+ (python (string-append (assoc-ref %build-inputs "python")
"/bin/")))
+ (mkdir-p bin)
+ (for-each
+ (lambda (old new)
+ (symlink (string-append python old)
+ (string-append bin "/" new)))
+ `("python3" ,"pydoc3" ,"idle3" ,"pip3")
+ `("python" ,"pydoc" ,"idle" ,"pip"))
+ ;; python-config outputs search paths based upon its location,
+ ;; use a bash wrapper to avoid changing its outputs.
+ (let ((bash (string-append (assoc-ref %build-inputs "bash")
+ "/bin/bash"))
+ (old (string-append python "python3-config"))
+ (new (string-append bin "/python-config")))
+ (with-output-to-file new
+ (lambda ()
+ (format #t "#!~a~%" bash)
+ (format #t "exec \"~a\" \"$@\"~%" old)
+ (chmod new #o755)
+ #t)))))))
(synopsis "Wrapper for the Python 3 commands")
(description
"This package provides wrappers for the commands of Python@tie{}3.x such
--
2.32.0
- [bug#49025] [PATCH core-updates 00/37] Support cross-compilation with meson, (continued)
- [bug#49025] [[PATCH v2 core-updates] 01/37] utils: Define target-linux? predicate., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 02/37] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 03/37] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 08/37] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 06/37] net-base: Don't cross-compile., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 09/37] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 12/37] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp.,
Maxime Devos <=
- [bug#49025] [[PATCH v2 core-updates] 17/37] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends, Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 04/37] net-base: Make #:builder argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 07/37] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 10/37] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 16/37] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 18/37] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 19/37] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/06/18
- [bug#49025] [[PATCH v2 core-updates] 21/37] openssl: Find bin/env when cross-compiling., Maxime Devos, 2021/06/18