From ea785c2bb83ba6c2fb650e008f0bb8b7bbc25f4a Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 23 Dec 2023 16:33:25 +0100 Subject: [PATCH] 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 --- 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