guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

90/217: gnu: glade3: Remove sitecustomize.py workaround.


From: guix-commits
Subject: 90/217: gnu: glade3: Remove sitecustomize.py workaround.
Date: Sun, 14 Nov 2021 19:20:49 -0500 (EST)

vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 10cdbe33271fe2b07a7930152b729c911b5f5e88
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Sep 3 11:15:08 2021 -0400

    gnu: glade3: Remove sitecustomize.py workaround.
    
    The issue has since been resolved.
    
    * gnu/packages/gnome.scm (glade3)[phases]{fix-tests}: Delete phase.
---
 gnu/packages/gnome.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 189efd3..98adeec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3240,28 +3240,21 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
            (lambda _
              (substitute* "meson_post_install.py"
                (("gtk-update-icon-cache") "true"))))
-         ;; XXX: Remove it once this issue is fixed:
-         ;; https://issues.guix.gnu.org/50105.
-         (add-after 'unpack 'fix-tests
-           (lambda _
-             (substitute* "tests/meson.build"
-               (("\\['modules") "#['modules"))))
          (add-before 'configure 'fix-docbook
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "man/meson.build"
-               
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";)
+               (("http://docbook.sourceforge.net/release/xsl/\
+current/manpages/docbook.xsl")
                 (string-append (assoc-ref inputs "docbook-xsl")
                                "/xml/xsl/docbook-xsl-"
                                ,(package-version docbook-xsl)
-                               "/manpages/docbook.xsl")))
-             #t))
+                               "/manpages/docbook.xsl")))))
          (add-before 'check 'pre-check
            (lambda _
              (setenv "HOME" "/tmp")
              ;; Tests require a running X server.
              (system "Xvfb :1 &")
-             (setenv "DISPLAY" ":1")
-             #t)))))
+             (setenv "DISPLAY" ":1"))))))
     (inputs
      `(("gtk+" ,gtk+)
        ("libxml2" ,libxml2)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]