From e080e35dc1f012fa57a8e77759f933abdc3b8fc2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Dec 2021 13:42:31 +0100 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 727d0617ec..bada1e866b 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") -- cgit v1.2.3 able>
path: root/.dir-locals.el
AgeCommit message (Expand)Author
2022-06-07.dir-locals: Adjust to bug-reference-mode in Emacs 28....Ludovic Courtès
2022-03-06import: github: Reuse HTTP connection for the /tags URL fallback....Ludovic Courtès
2022-03-06tests: Add (guix http-client) tests....Ludovic Courtès
2022-01-29.dir-locals.el: Don't mess up indentation of prepend and append....Liliana Marie Prikler
2021-08-12Merge branch 'master' into core-updates-frozen...Marius Bakke
2021-08-02.dir-locals.el: Specify indentation rule for with-shepherd-action....Maxim Cournoyer
2021-07-18Merge branch 'master' into core-updatesLudovic Courtès
2021-07-11packages: Add 'modify-inputs'....Ludovic Courtès
2021-06-29pack: Add support for the deb format....Maxim Cournoyer
2021-03-30build-system: Rewrite using gexps....Ludovic Courtès
2020-12-15system: 'init' does not recompute the hash of each store item....Ludovic Courtès
2020-11-17Merge remote-tracking branch 'origin/version-1.2.0' into master...Maxim Cournoyer
2020-11-16.dir-locals.el: Add upstream report link....Miguel Ángel Arruga Vivas
2020-11-16.dir-locals.el: Use setq-local on guix-directory....Christopher Lemmer Webber
2020-11-16.dir-locals.el: Prevent errors if .dir-locals.el isn't found....Christopher Lemmer Webber
2020-11-12maint: update-guix-package: Optionally add sources to store....Maxim Cournoyer
2020-11-01.dir-locals.el: Require cl-lib at runtime....Miguel Ángel Arruga Vivas
2020-10-31.dir-locals.el: Automatically set the GEISER-GUILE-LOAD-PATH variable....Maxim Cournoyer
2020-10-19maint: update-guix-package: Prevent accidentally breaking guix pull....Maxim Cournoyer
2020-09-14deduplication: pass store directory to replace-with-link....Caleb Ristvedt
2020-09-14.dir-locals.el: fix call-with-{retrying-}transaction indenting....Caleb Ristvedt
2020-08-26.dir-locals.el: Add indentation rule for 'package/inherit'....Ludovic Courtès
2020-06-25deduplication: Use 'dynamic-wind' when changing permissions of the parent....Ludovic Courtès
2020-06-16channels: 'latest-channel-instance' authenticates Git checkouts....Ludovic Courtès
2020-06-10database: separate transaction-handling and retry-handling....Caleb Ristvedt
2020-06-10database: ensure update-or-insert is run within a transaction...Caleb Ristvedt
2020-06-10database: rewrite query procedures in terms of with-statement....Caleb Ristvedt
2020-06-06ui: 'display-search-results' automatically invokes the pager....Ludovic Courtès
2020-06-05git-authenticate: Add tests....Ludovic Courtès
2020-05-16gexp: Add 'let-system'....Ludovic Courtès
2020-03-22store: Add 'with-build-handler'....Ludovic Courtès
2020-03-12gexp: Add 'with-parameters'....Ludovic Courtès