From 5dfb1d026a1fea2124272e70663a761d3e6efd37 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 12 Sep 2025 00:10:50 -0400 Subject: [PATCH] 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 --- 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 4bbc3a7aefc644dfb9b5ee3aeac3965d450f622f..790777b2fc0999937ea26c2a3007bf3c2ab9fe94 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 bee44f58588dc123221ffbee44fcf19f77cdff94..e7c6b61e0652a15cb6b677fd4cdade41ce07279f 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")