[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/16: gnu: glade: Use G-expression.
From: |
guix-commits |
Subject: |
09/16: gnu: glade: Use G-expression. |
Date: |
Thu, 1 Sep 2022 16:24:46 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit d2bddfd736196824cae2d1feaf3bf8997cd86cc3
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Sep 1 20:13:35 2022 +0200
gnu: glade: Use G-expression.
* gnu/packages/gnome.scm (glade3)[arguments]: Convert to gexp.
---
gnu/packages/gnome.scm | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 64363fe842..c571682e8f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3132,30 +3132,31 @@ API add-ons to make GTK+ widgets OpenGL-capable.")
"171x7vshhw0nqgnhkcaqfylpr5qrmhclwmkva6wjm5s9m2pavj9i"))))
(build-system meson-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-gtk-update-icon-cache
- ;; Don't create 'icon-theme.cache'.
- (lambda _
- (substitute* "meson_post_install.py"
- (("gtk-update-icon-cache") "true"))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-gtk-update-icon-cache
+ ;; Don't create 'icon-theme.cache'.
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("gtk-update-icon-cache") "true"))))
- ,@(if (this-package-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 'check 'pre-check
- (lambda _
- (setenv "HOME" "/tmp")
- ;; Tests require a running X server.
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1"))))))
+ #$@(if (this-package-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 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp")
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
(inputs
(append
;; GJS depends on Rust, which is x86_64-only so far, so remove the GJS
- branch master updated (aa5e030713 -> 23a91e9a2e), guix-commits, 2022/09/01
- 01/16: gnu: gtk-vnc: Update to 1.2.0., guix-commits, 2022/09/01
- 06/16: gnu: glade: Remove input labels., guix-commits, 2022/09/01
- 02/16: gnu: gtk-vnc: Remove input labels., guix-commits, 2022/09/01
- 04/16: gnu: glade: gjs is a run-time dependency., guix-commits, 2022/09/01
- 05/16: gnu: glade: Update to 3.40.0., guix-commits, 2022/09/01
- 08/16: gnu: glade: Don't patch docbook files., guix-commits, 2022/09/01
- 09/16: gnu: glade: Use G-expression.,
guix-commits <=
- 13/16: gnu: network-manager-applet: Update to 1.28.0., guix-commits, 2022/09/01
- 14/16: gnu: network-manager-applet: Remove input labels., guix-commits, 2022/09/01
- 15/16: gnu: network-manager-applet: Remove obsolete input., guix-commits, 2022/09/01
- 03/16: gnu: gtk-vnc: Remove obsolete input., guix-commits, 2022/09/01
- 10/16: gnu: cheese: Update to 41.0., guix-commits, 2022/09/01
- 12/16: gnu: cheese: Don't patch docbook references., guix-commits, 2022/09/01
- 16/16: gnu: gnome-music: Remove input labels., guix-commits, 2022/09/01
- 07/16: gnu: glade: Remove obsolete input., guix-commits, 2022/09/01
- 11/16: gnu: cheese: Remove input labels., guix-commits, 2022/09/01