guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 5dfb1d026a1fea2124272e70663a761d3e6efd37
Author: John Kehayias <[email protected]>
AuthorDate: Fri Sep 12 00:10:50 2025 -0400
gnu: Add xvfb-run-for-tests.
* gnu/packages/xorg.scm (xorg-server-for-tests): Update comment.
(xvfb-run-for-tests): New variable.
* gnu/packages/qt.scm (qtbase)[native-inputs]: Use it instead of xvfb-run.
Change-Id: I464f13e15f7952aed975a34396ab644e7f2789ab
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/qt.scm | 2 +-
gnu/packages/xorg.scm | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4bbc3a7aef..790777b2fc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1191,7 +1191,7 @@ tst_qt_cmake_create.cpp"
(prepend ninja ;CMake Generator, also used for tests
tzdata-for-tests
wayland-protocols
- xvfb-run)))
+ xvfb-run-for-tests)))
(propagated-inputs
(modify-inputs (package-propagated-inputs qtbase-5)
;; Required by Qt6GuiDependencies.cmake.
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bee44f5858..e7c6b61e06 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5367,7 +5367,8 @@ communicates with the user via graphical controls such as
buttons and
draggable titlebars and borders.")
(license license:x11)))
-;; This package is intended to be used when building GTK+.
+;; This package is intended to be used when building GTK+ qtbase (via
+;; xvfb-run-for-tests).
;; Note: It's currently marked as "hidden" to avoid having two non-eq?
;; packages with the same name and version.
(define-public xorg-server-for-tests
@@ -7141,6 +7142,17 @@ the server and cleaning up before returning the exit
status of the command.")
(license (list license:x11 ; the script
license:gpl2+)))) ; the man page
+;; This package is intended to be used when building qtbase.
+;; Note: It's currently marked as "hidden" to avoid having two non-eq?
+;; packages with the same name and version.
+(define-public xvfb-run-for-tests
+ (hidden-package
+ (package
+ (inherit xvfb-run)
+ (inputs
+ (modify-inputs (package-inputs xvfb-run)
+ (replace "xorg-server" xorg-server-for-tests))))))
+
(define-public xwayland-run
(package
(name "xwayland-run")
