[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: gnu: python-wand: Fix libmagick access.
From: |
guix-commits |
Subject: |
12/12: gnu: python-wand: Fix libmagick access. |
Date: |
Fri, 12 Jan 2024 11:35:40 -0500 (EST) |
mothacehe pushed a commit to branch master
in repository guix.
commit ea785c2bb83ba6c2fb650e008f0bb8b7bbc25f4a
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Sat Dec 23 16:33:25 2023 +0100
gnu: python-wand: Fix libmagick access.
* 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
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
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 46a5e81cb4..37d7dd0dd5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2594,18 +2594,18 @@ conventions and aliases in the same expression.")
(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
- branch master updated (c4fa3e945e -> ea785c2bb8), guix-commits, 2024/01/12
- 03/12: tests: security: Fix fail2ban-extension-test., guix-commits, 2024/01/12
- 06/12: gnu: wesnoth: Update to 1.16.11., guix-commits, 2024/01/12
- 01/12: gnu: libsmbios: Restrict to only supported systems., guix-commits, 2024/01/12
- 12/12: gnu: python-wand: Fix libmagick access.,
guix-commits <=
- 11/12: doc: Fix typos and add readonly option to qemu invocation., guix-commits, 2024/01/12
- 09/12: scripts: size: Fix `guix size` with --system argument., guix-commits, 2024/01/12
- 05/12: gnu: laminar: Update to 1.3., guix-commits, 2024/01/12
- 02/12: gnu: fwupd: Depend on libsmbios only on supported systems., guix-commits, 2024/01/12
- 04/12: gnu: plocate: Update to 1.1.21., guix-commits, 2024/01/12
- 07/12: gnu: kakoune: update to 2023.08.05., guix-commits, 2024/01/12
- 08/12: gnu: poppler: Mention binaries in description., guix-commits, 2024/01/12
- 10/12: gnu: go-github-com-charmbracelet-glamour: Fix build., guix-commits, 2024/01/12