From 5cfa0482b151b0f0579d72ed9517d59902016aaa Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 28 Aug 2025 12:52:18 +0300 Subject: [PATCH] qt6.qtwebengine: revert commit that breaks graphics acceleration on Mesa 25.2 --- .../libraries/qt-6/modules/qtwebengine/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 7ac7d6f43876..43c7aea86f15 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -64,6 +64,8 @@ bootstrap_cmds, cctools, xcbuild, + + fetchpatch, }: qtModule { @@ -110,6 +112,15 @@ qtModule { # Reproducibility QTBUG-136068 ./gn-object-sorted.patch + + # Revert "Create EGLImage with eglCreateDRMImageMESA() for exporting dma_buf" + # Mesa 25.2 dropped eglCreateDRMImageMESA, so this no longer works. + # There are better ways to do this, but this is the easy fix for now. + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ddcd30454aa6338d898c9d20c8feb48f36632e16.diff"; + revert = true; + hash = "sha256-ht7C3GIEaPtmMGLzQKOtMqE9sLKdqqYCgi/W6b430YU="; + }) ]; postPatch = ''