guix-commits
[Top][All Lists]
Advanced

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

04/04: gnu: glade: Remove dependency on GJS on non-x86_64.


From: guix-commits
Subject: 04/04: gnu: glade: Remove dependency on GJS on non-x86_64.
Date: Thu, 2 Dec 2021 09:00:36 -0500 (EST)

civodul pushed a commit to branch core-updates-frozen
in repository guix.

commit e080e35dc1f012fa57a8e77759f933abdc3b8fc2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Dec 2 13:42:31 2021 +0100

    gnu: glade: Remove dependency on GJS on non-x86_64.
    
    * gnu/packages/gnome.scm (glade3)[arguments]: Add optional
    'skip-gjs-test' phase.
    [native-inputs]: Provide GJS only when 'target-x86-64?'.
---
 gnu/packages/gnome.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 727d061..bada1e8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3292,6 +3292,18 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
            (lambda _
              (substitute* "meson_post_install.py"
                (("gtk-update-icon-cache") "true"))))
+
+         ,@(if (this-package-native-input "gjs")
+               '()
+               '((add-after 'unpack 'skip-gjs-test
+                   (lambda _
+                     ;; When the optional dependency on GJS is missing, skip
+                     ;; the GJS plugin tests.
+                     (substitute* "tests/modules.c"
+                       (("g_test_add.*JavaScript.*" all)
+                        (string-append "// " all "\n")))
+                     (delete-file "tests/catalogs/gjsplugin.xml")))))
+
          (add-before 'configure 'fix-docbook
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "man/meson.build"
@@ -3320,7 +3332,13 @@ current/manpages/docbook.xsl")
        ("glib:bin" ,glib "bin")
        ("python-pygobject" ,python-pygobject)
        ("gobject-introspection" ,gobject-introspection)
-       ("gjs" ,gjs)
+
+       ;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS
+       ;; dependency on other platforms (FIXME).
+       ,@(if (target-x86-64?)
+             `(("gjs" ,gjs))
+             '())
+
        ("pkg-config" ,pkg-config)
        ("xorg-server" ,xorg-server-for-tests)))
     (home-page "https://glade.gnome.org";)



reply via email to

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