From 0ddab62d3d834015f0a89e249cc47e41e5b7cde2 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 14 Nov 2024 19:23:39 +0300 Subject: [PATCH] qt6.qtdeclarative: backport more patches recommended by upstream Should fix SDDM misbehaving with multiple displays. --- .../libraries/qt-6/modules/qtdeclarative.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 42f5bfd76b88..5ca2fb74b498 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -37,6 +37,16 @@ qtModule { url = "https://github.com/qt/qtdeclarative/commit/0ae3697cf40bcd3ae1de20621abad17cf6c5f52d.patch"; hash = "sha256-YuTHqHCWOsqUOATfaAZRxPSwMsFNylxoqnqCeW5kPjs="; }) + # Backport patches to fix SDDM multi-screen issues + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/104b0d6e88ce6781c9d31cf0dd14dfe99988b789.patch"; + hash = "sha256-fWjFvaSnDcqquqfNkwEIHlp2Cxmf4DmWmQyYhEj9Jbw="; + }) + (fetchpatch2 { + url = "https://github.com/qt/qtdeclarative/commit/fbdbed919f59cc7b4520f5aab2149f4c99b63e24.patch"; + excludes = [ "tests/auto/qml/qv4mm/tst_qv4mm.cpp" ]; + hash = "sha256-YsB81v0apTK+GdzVa3oMe4akcz5sxuI3aUjCLu1bTJ8="; + }) ]; cmakeFlags = [