unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#67992] [PATCH] gnu: python-wand: Fix libmagick access.
@ 2023-12-23 15:33 Nicolas Graves via Guix-patches via
  2024-01-12 16:33 ` bug#67992: " Mathieu Othacehe
  0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2023-12-23 15:33 UTC (permalink / raw)
  To: 67992; +Cc: ngraves

* 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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#67992: [PATCH] gnu: python-wand: Fix libmagick access.
  2023-12-23 15:33 [bug#67992] [PATCH] gnu: python-wand: Fix libmagick access Nicolas Graves via Guix-patches via
@ 2024-01-12 16:33 ` Mathieu Othacehe
  0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2024-01-12 16:33 UTC (permalink / raw)
  To: Nicolas Graves; +Cc: 67992-done


> * 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




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-01-12 16:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-23 15:33 [bug#67992] [PATCH] gnu: python-wand: Fix libmagick access Nicolas Graves via Guix-patches via
2024-01-12 16:33 ` bug#67992: " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).