From patchwork Mon Feb 5 15:48:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 59801 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 2DA1F27BBEB; Mon, 5 Feb 2024 15:50:05 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 D382E27BBEA for ; Mon, 5 Feb 2024 15:50:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rX1EG-00054D-Po; Mon, 05 Feb 2024 10:49:52 -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 1rX1EE-00053F-LH for guix-patches@gnu.org; Mon, 05 Feb 2024 10:49:50 -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 1rX1ED-0001iM-R3 for guix-patches@gnu.org; Mon, 05 Feb 2024 10:49:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rX1EP-0005xV-M4; Mon, 05 Feb 2024 10:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68937] [PATCH 1/3] gnu: orca: Fix invocation errors. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 05 Feb 2024 15:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68937@debbugs.gnu.org Cc: Dariqq , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus Received: via spool by 68937-submit@debbugs.gnu.org id=B68937.170714818422849 (code B ref 68937); Mon, 05 Feb 2024 15:50:01 +0000 Received: (at 68937) by debbugs.gnu.org; 5 Feb 2024 15:49:44 +0000 Received: from localhost ([127.0.0.1]:52109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX1E7-0005wS-Ho for submit@debbugs.gnu.org; Mon, 05 Feb 2024 10:49:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:38089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rX1E5-0005w4-GK for 68937@debbugs.gnu.org; Mon, 05 Feb 2024 10:49:42 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id CC69F240101 for <68937@debbugs.gnu.org>; Mon, 5 Feb 2024 16:49:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707148162; bh=C0pPQa0mnHq3V6R67c9JunGAzKde0KCFRRfMbgnULQ8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Pd2zpfGVRSHhoMtDIDXvq6efYd8UQdTdpNkzDzgAVM8VNmxq06dVTGNw+ZkoestQq LKx0Mi89tp4f/ibvRQTJGvWcOPJ2yslAb/hcFrIvBNicvl1B5ZezyIdBqoqZAD1Eho xGPmKdDIvsm9b+bldmxiHFLFJqeSaPUOeNeYASGQ9arA2Ajr4WFXvJUbQAsyENhuGZ gtm8HGzCkh1zIcxbwzNMQT250EBHJ1mR3Pi+4ke9yqkSst6t3SeDAfcvX9JE6fJtx1 VxAh5GejuRKtAnNOM7llJD+ZyY2SPuGgRH7Lc2aOS2Q6Sie1a8BvWpHoy4LCkfMw5O Z2MR6IuoMyECA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TT9mL2BCFz6txY; Mon, 5 Feb 2024 16:49:21 +0100 (CET) From: Dariqq Date: Mon, 5 Feb 2024 15:48:36 +0000 Message-ID: <83fc1fec3f3d3dab016081c7bbcc9055361a503d.1707146219.git.dariqq@posteo.net> In-Reply-To: References: MIME-Version: 1.0 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: , 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 at-spi2-atk causes 'import pyatspi' to fail. Add orca libraries to GUIX_PYTHONPATH such that the orca modules can be found. * gnu/pacakges/gnome.scm (orca)[inputs]: Remove at-spi2-atk. [phases] wrap-orca: Add self to GUIX_PYTHONPATH. Change-Id: I3a2cd1a410a4c391c6263df2d29b9ec75ecc8da4 --- gnu/packages/gnome.scm | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f22529dd7..0d3fcbe086 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11115,30 +11115,36 @@ (define-public orca "097pyav3z5ssic8vwd7v1s7vynpycdpyfr324rr6c7mfzq5vmp7s")))) (build-system glib-or-gtk-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'qualify-xkbcomp - (lambda* (#:key inputs #:allow-other-keys) - (let ((xkbcomp (string-append - (assoc-ref inputs "xkbcomp") "/bin/xkbcomp"))) - (substitute* "src/orca/orca.py" - (("'xkbcomp'") (format #f "'~a'" xkbcomp)))))) - (add-after 'install 'wrap-orca - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/orca") - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH"))) - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix - (,(getenv "GST_PLUGIN_SYSTEM_PATH"))) - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'qualify-xkbcomp + (lambda* (#:key inputs #:allow-other-keys) + (let ((xkbcomp (string-append + (assoc-ref inputs "xkbcomp") "/bin/xkbcomp"))) + (substitute* "src/orca/orca.py" + (("'xkbcomp'") (format #f "'~a'" xkbcomp)))))) + (add-after 'set-install 'wrap-orca + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pylib (string-append out "/lib/python" + #$(version-major+minor + (package-version (this-package-input "python"))) + "/site-packages"))) + (wrap-program (search-input-file outputs "bin/orca") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))) + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix + (,(getenv "GST_PLUGIN_SYSTEM_PATH"))) + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH") ,pylib))))))))) (native-inputs (list gettext-minimal itstool pkg-config libxml2)) (inputs - (list at-spi2-atk + (list ;; at-spi2-atk bash-minimal gsettings-desktop-schemas gstreamer