GNU bug report logs - #77254
[PATCH] gnu: aacircuit: Wrap program properly.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 25 Mar 2025 17:31:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 25 13:31:37 2025
Received: from localhost ([127.0.0.1]:39875 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tx87k-0008MX-Si
	for submit <at> debbugs.gnu.org; Tue, 25 Mar 2025 13:31:37 -0400
Received: from lists.gnu.org ([2001:470:142::17]:51236)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <mail@HIDDEN>)
 id 1tx87h-0008Kw-G5
 for submit <at> debbugs.gnu.org; Tue, 25 Mar 2025 13:31:34 -0400
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 <mail@HIDDEN>)
 id 1tx86x-0005d6-BB
 for guix-patches@HIDDEN; Tue, 25 Mar 2025 13:30:48 -0400
Received: from pisemsky.site ([103.54.19.55])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <mail@HIDDEN>)
 id 1tx86u-0001CB-SI
 for guix-patches@HIDDEN; Tue, 25 Mar 2025 13:30:47 -0400
Received: from localhost.localdomain (<unknown> [176.59.36.166])
 by pisemsky.site (OpenSMTPD) with ESMTPSA id ae3d3fc3
 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <guix-patches@HIDDEN>;
 Tue, 25 Mar 2025 17:30:32 +0000 (UTC)
From: Evgeny Pisemsky <mail@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: aacircuit: Wrap program properly.
Date: Tue, 25 Mar 2025 20:30:26 +0300
Message-ID: <ec5bcfbc83dec004ba413d4bbf8418537c93960c.1742923826.git.mail@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
X-Debbugs-Cc: Cayetano Santos <csantosb@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=103.54.19.55; envelope-from=mail@HIDDEN;
 helo=pisemsky.site
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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

* gnu/packages/engineering.scm (aacircuit): Wrap program properly.
[arguments]: Import modules from glib-or-gtk-build-system, add new phases:
generate-gdk-pixbuf-loaders-cache-file, glib-or-gtk-wrap, wrap-aacircuit.
[propagated-inputs]: Move every input from here...
[inputs]: to here, add bash-minimal.

Change-Id: Ia9e5b0908b7464a0dfe0fd8ffa4675cad95c0dd9
---
 gnu/packages/engineering.scm | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 8b6bd85293..c55dfe8726 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -195,8 +195,17 @@ (define-public aacircuit
       (build-system pyproject-build-system)
       (arguments
        (list
+        #:imported-modules `((guix build glib-or-gtk-build-system)
+                             ,@%pyproject-build-system-modules)
+        #:modules '(((guix build glib-or-gtk-build-system)
+                     #:prefix glib-or-gtk:)
+                    (guix build pyproject-build-system)
+                    (guix build utils))
         #:phases
         #~(modify-phases %standard-phases
+            (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+              (assoc-ref glib-or-gtk:%standard-phases
+                         'generate-gdk-pixbuf-loaders-cache-file))
             (replace 'check
               (lambda* (#:key tests? #:allow-other-keys)
                 (when tests?
@@ -208,7 +217,18 @@ (define-public aacircuit
                                          "test_import_aacircuit_export_pdf")
                                        ","))
                   (setenv "HOME" "/tmp")
-                  (invoke "xvfb-run" "./testrunner.sh")))))))
+                  (invoke "xvfb-run" "./testrunner.sh"))))
+            (add-after 'wrap 'glib-or-gtk-wrap
+              (assoc-ref glib-or-gtk:%standard-phases
+                         'glib-or-gtk-wrap))
+            (add-after 'glib-or-gtk-wrap 'wrap-aacircuit
+              (lambda* (#:key outputs #:allow-other-keys)
+                (wrap-program (string-append (assoc-ref outputs "out")
+                                             "/bin/aacircuit")
+                  `("GDK_PIXBUF_MODULE_FILE" =
+                    (,(getenv "GDK_PIXBUF_MODULE_FILE")))
+                  `("GI_TYPELIB_PATH" ":" prefix
+                    (,(getenv "GI_TYPELIB_PATH")))))))))
       (native-inputs
        ;; XXX: Test runner may be migrated to Pytest
        ;; <https://docs.pytest.org/en/7.1.x/how-to/nose.html> after report to
@@ -218,8 +238,9 @@ (define-public aacircuit
              python-setuptools
              python-wheel
              xvfb-run))
-      (propagated-inputs
-       (list gtk+
+      (inputs
+       (list bash-minimal
+             gtk+
              python-bresenham
              python-platformdirs
              python-pycairo

base-commit: ff019629025871caa2fbc78cf921fb46e96e94de
-- 
2.49.0