From 1a8c4302b1541a41d9b43cf73ec5bd074e0d736d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 24 Nov 2025 12:37:28 +0300 Subject: [PATCH] opencloud-desktop: fix build with Qt 6.10.1 --- pkgs/by-name/op/opencloud-desktop/package.nix | 6 ++++++ pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix index 64bef0d25e2b..da1dfad4fbeb 100644 --- a/pkgs/by-name/op/opencloud-desktop/package.nix +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY="; }; + # Fix build with Qt 6.10.1 + # Submitted upstream: https://github.com/opencloud-eu/desktop/pull/710 + patches = [ + ./qt-6.10.1.patch + ]; + buildInputs = [ ecm618 qt6.qtbase diff --git a/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch b/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch new file mode 100644 index 000000000000..c3e59ca05482 --- /dev/null +++ b/pkgs/by-name/op/opencloud-desktop/qt-6.10.1.patch @@ -0,0 +1,13 @@ +diff --git a/src/libsync/globalconfig.h b/src/libsync/globalconfig.h +index 7094385b4..2ef8a44d2 100644 +--- a/src/libsync/globalconfig.h ++++ b/src/libsync/globalconfig.h +@@ -6,7 +6,7 @@ + #include "libsync/opencloudsynclib.h" + + #include +-#include ++#include + + namespace OCC { + class OPENCLOUD_SYNC_EXPORT GlobalConfig : public QObject