From b3d6434288370b210176630928525a30ea896838 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 13 Apr 2025 14:54:59 +0800 Subject: [PATCH] deepin.qt6integration: 6.0.24 -> 6.0.33 --- .../deepin/library/qt6integration/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 1383ef81e07e..5b69215df8c6 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, pkg-config, dtk6widget, @@ -11,15 +12,23 @@ stdenv.mkDerivation rec { pname = "qt6integration"; - version = "6.0.24"; + version = "6.0.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw="; + hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ="; }; + patches = [ + (fetchpatch { + name = "resolve-compilation-issues-on-Qt-6_9.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch"; + hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config