about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2024-06-30 07:05:20 +0300
committerGitHub <noreply@github.com>2024-06-30 07:05:20 +0300
commitd6da1b902be83af5c2a6148a927ed8d2b48199a6 (patch)
treecf217a78137bc299d27c08c4a619f5f48684ada4 /pkgs
parent7244df692701da41a24ae1b10c03c63f5806b7db (diff)
parentaf779007e7dfa9cc80bbd5b0806dd85d17db5064 (diff)
Merge pull request #323485 from OPNA2608/fix/qtsystems-nodisplay-crash
libsForQt5.qtsystems: Fetch patch to fix crash on XOpenDisplay failure
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/qt-5/5.15/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index b1308159eb688..dabb77ea0c85d 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -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";