Merge pull request #323485 from OPNA2608/fix/qtsystems-nodisplay-crash (d6da1b90) · Commits · mdf / nixpkgs

nixos/tests/lomiri.nix

+2 −4

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ in {

		# morph-browser has a separate VM test, there isn't anything new we could test here

		# Keep it running, we're using it to check content-hub communication from LSS
		machine.send_key("alt-f4")

		# LSS provides DE settings
		with subtest("system settings open"):
		@@ -282,9 +282,7 @@ in {
		# Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign
		machine.send_key("esc")

		machine.send_key("alt-f4") # LSS
		machine.sleep(2) # focus is slow to switch to second window, closing it really helps with OCR afterwards
		machine.send_key("alt-f4") # Morph
		machine.send_key("alt-f4")

		# The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session.
		# There's a test app we could use that also displays their contents, but it's abit inconsistent.

+6 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,12 @@ let
		qtscript = [ ./qtscript.patch ];
		qtserialport = [ ./qtserialport.patch ];
		qtsystems = [
		# Fix crash if no X11 display available
		(fetchpatch {
		url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/1a4df40671d6f1bb0657a9dfdae4cd9bd48fcf21/debian/patches/1005_check_XOpenDisplay.patch";
		hash = "sha256-/onla2nlUSySEgz2IYOYajx/LZkJzAKDyxwAZzy0Ivs=";
		})

		# Enable building with udisks support
		(fetchpatch {
		url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/a23fd92222c33479d7f3b59e48116def6b46894c/debian/patches/2001_build_with_udisk.patch";