From patchwork Sat Dec 23 15:33:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 58002 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CB64F27BBE9; Sat, 23 Dec 2023 15:35:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 18BEF27BBE2 for ; Sat, 23 Dec 2023 15:35:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rH41j-0005lb-1E; Sat, 23 Dec 2023 10:34:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rH41h-0005lT-Ii for guix-patches@gnu.org; Sat, 23 Dec 2023 10:34:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rH41h-0000Mm-AE for guix-patches@gnu.org; Sat, 23 Dec 2023 10:34:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rH41m-0000CW-Hz for guix-patches@gnu.org; Sat, 23 Dec 2023 10:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67992] [PATCH] gnu: python-wand: Fix libmagick access. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Dec 2023 15:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67992 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67992@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1703345663718 (code B ref -1); Sat, 23 Dec 2023 15:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Dec 2023 15:34:23 +0000 Received: from localhost ([127.0.0.1]:51086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH419-0000BV-Aq for submit@debbugs.gnu.org; Sat, 23 Dec 2023 10:34:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH417-0000BI-7M for submit@debbugs.gnu.org; Sat, 23 Dec 2023 10:34:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rH40w-0005hu-CN for guix-patches@gnu.org; Sat, 23 Dec 2023 10:34:10 -0500 Received: from 10.mo550.mail-out.ovh.net ([178.32.96.102]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rH40u-0000J4-8M for guix-patches@gnu.org; Sat, 23 Dec 2023 10:34:10 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.176.70]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 7D48B28942 for ; Sat, 23 Dec 2023 15:33:57 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zl9bx (unknown [10.110.96.102]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 33DDA1FE8F; Sat, 23 Dec 2023 15:33:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-zl9bx with ESMTPSA id JyVPC+X9hmXxtwAA0Lc0bQ (envelope-from ); Sat, 23 Dec 2023 15:33:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004735b7109-360b-45d5-b4a1-2bddcabdf015, 1477E3D5B811999E27DDFBC5A96B472F774B225C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.2.223 Date: Sat, 23 Dec 2023 16:33:25 +0100 Message-ID: <20231223153325.26379-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 18295029065367610082 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdduledgjeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddruddutddrvddrvddvfedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=178.32.96.102; envelope-from=ngraves@ngraves.fr; helo=10.mo550.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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