nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323485 from OPNA2608/fix/qtsystems-nodisplay-crash

Browse Source 
libsForQt5.qtsystems: Fetch patch to fix crash on XOpenDisplay failure
This commit is contained in:
K900 2024-06-30 07:05:20 +03:00 committed by GitHub
commit d6da1b902b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/lomiri.nix
View File

@ -230,7 +230,7 @@ in {
# morph-browser has a separate VM test, there isn't anything new we could test here # 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 # LSS provides DE settings
with subtest("system settings open"): 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 # 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("esc")
machine.send_key("alt-f4") # LSS machine.send_key("alt-f4")
machine.sleep(2) # focus is slow to switch to second window, closing it *really* helps with OCR afterwards
machine.send_key("alt-f4") # Morph
# The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session. # 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. # There's a test app we could use that also displays their contents, but it's abit inconsistent.

6
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -174,6 +174,12 @@ let
qtscript = [ ./qtscript.patch ]; qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ]; qtserialport = [ ./qtserialport.patch ];
qtsystems = [ 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 # Enable building with udisks support
(fetchpatch { (fetchpatch {
url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/a23fd92222c33479d7f3b59e48116def6b46894c/debian/patches/2001_build_with_udisk.patch"; url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/a23fd92222c33479d7f3b59e48116def6b46894c/debian/patches/2001_build_with_udisk.patch";