From 6d7a0b84e202ee29336cc758bf0cb90d5ffcdfb6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 3 Sep 2021 11:15:08 -0400 Subject: [PATCH] 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 a8280ebfe5..db7b6dff27 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3241,28 +3241,21 @@ (define-public glade3 (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)))