Unverified Commit fd509bb6 authored by K900's avatar K900 Committed by GitHub
Browse files

opencloud-desktop: 2.0.0 -> 3.0.2, drop hacks (#465750)

parents 45d3c39f 22b836e2
Loading
Loading
Loading
Loading
+3 −29
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
  cmake,
  kdePackages,
  fetchFromGitHub,
  fetchFromGitLab,
  libre-graph-api-cpp-qt-client,
  kdsingleapplication,
  nix-update-script,
@@ -11,46 +10,21 @@
  versionCheckHook,
  stdenv,
}:
let
  # See issue https://github.com/NixOS/nixpkgs/issues/455981
  # It was spotted upstream that ecm 6.19.0 caused this issue
  # Therefore we pin ecm 6.18.0 which makes opencloud function correctly
  ecm618 = kdePackages.extra-cmake-modules.overrideAttrs (
    finalAttrs: prevAttrs: {
      version = "6.18.0";
      src = fetchFromGitLab {
        domain = "invent.kde.org";
        owner = "frameworks";
        repo = "extra-cmake-modules";
        tag = "v${finalAttrs.version}";
        hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y=";
      };
      patches = [ ];
    }
  );

in
stdenv.mkDerivation (finalAttrs: {
  pname = "opencloud-desktop";
  version = "2.0.0";
  version = "3.0.2";
  src = fetchFromGitHub {
    owner = "opencloud-eu";
    repo = "desktop";
    tag = "v${finalAttrs.version}";
    hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY=";
    hash = "sha256-ILOapZfySDJWZJDVFwNs46SEw/yPpe/+2dctyRl8iJ8=";
  };

  # 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
    qt6.qtdeclarative
    qt6.qttools
    kdePackages.extra-cmake-modules
    kdePackages.qtkeychain
    libre-graph-api-cpp-qt-client
    kdsingleapplication
+0 −13
Original line number Diff line number Diff line
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 <QVariant>
-#include <QtQmlMeta>
+#include <QtQmlIntegration/QtQmlIntegration>
 
 namespace OCC {
 class OPENCLOUD_SYNC_EXPORT GlobalConfig : public QObject