--- Begin Message ---
Subject: |
[PATCH] gnu: python-wand: Fix libmagick access. |
Date: |
Sat, 23 Dec 2023 16:33:25 +0100 |
* gnu/packages/python-xyz.scm (python-wand):
[build-system]: Use pyproject-build-system.
[arguments](phases): Delete phase check. Replace phase find-magickwand
by phase harcode-lib-path.
Change-Id: I3ddf7045a404f76743c14a5b8183ce9f3196ffd1
---
gnu/packages/python-xyz.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69e9c7a04d..226c4de035 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2612,18 +2612,18 @@ (define-public python-wand
(uri (pypi-uri "Wand" version))
(sha256
(base32 "1jpwm956vm35hmgjndr2jwrcql0bwvpsl88q5nr0x8ppxa2380gm"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-magickwand
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "MAGICK_HOME" (assoc-ref inputs "imagemagick"))
- (setenv "WAND_MAGICK_LIBRARY_SUFFIX" ".Q16")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'hardcode-lib-path
+ (lambda _
+ (substitute* "wand/api.py"
+ (("os\\.environ\\.get\\('MAGICK_HOME'\\)")
+ (string-append "\"" #$(this-package-input "imagemagick")
"\""))
+ (("os\\.environ\\.get\\('WAND_MAGICK_LIBRARY_SUFFIX'\\)")
+ "\".Q16\"")))))))
(native-inputs
(list python-pytest))
(inputs
--
2.41.0
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#67992] [PATCH] gnu: python-wand: Fix libmagick access. |
Date: |
Fri, 12 Jan 2024 17:33:51 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
> * gnu/packages/python-xyz.scm (python-wand):
> [build-system]: Use pyproject-build-system.
> [arguments](phases): Delete phase check. Replace phase find-magickwand
> by phase harcode-lib-path.
Applied, thanks,
Mathieu
--- End Message ---