2 files changed, 14 insertions(+), 2 deletions(-)

M gnu/packages/qt.scm
M gnu/packages/xorg.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.

@@ 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")