From c6e38d30329ca883e627e8aa7a489f4d1f149c2c Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 22 Oct 2025 10:00:39 +0000 Subject: [PATCH] lxqt.libqtxdg: fix build against Qt >= 6.10 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 3ea0a857efe8..dabc9a6eb7fa 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, qtbase, qtsvg, @@ -27,6 +28,16 @@ stdenv.mkDerivation rec { ."${version}"; }; + patches = lib.optionals (version == "4.2.0") [ + # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313) + # TODO: drop when upgrading beyond version 4.2.0 + (fetchpatch { + name = "cmake-fix-build-with-Qt-6.10.patch"; + url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch"; + hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU="; + }) + ]; + nativeBuildInputs = [ cmake lxqt-build-tools