diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch index d3bac6af08d2..312a0d089f60 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -16,7 +16,7 @@ index 887213f09..c66468306 100644 << QLatin1String("Name=") << guiName << QLatin1Char('\n') << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n") - << QLatin1String("Exec=\"") << executablePath << "\" --background\n" -+ << QLatin1String("Exec=") << "nextcloud --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background\n" << QLatin1String("Terminal=") << "false\n" << QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n') << QLatin1String("Categories=") << QLatin1String("Network\n") diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d4d5d2bb21f5..40e1b8f10107 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,20 +4,20 @@ , cmake , extra-cmake-modules , inotify-tools +, kdePackages , libcloudproviders , librsvg , libsecret , openssl , pcre , pkg-config +, qt5compat , qtbase , qtkeychain +, qtsvg , qttools , qtwebengine , qtwebsockets -, qtquickcontrols2 -, qtgraphicaleffects -, plasma5Packages , sphinx , sqlite , xdg-utils @@ -26,15 +26,15 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.4"; + version = "3.14.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "nextcloud-releases"; repo = "desktop"; - rev = "v${version}"; - hash = "sha256-anQwIqWtHdKFfUuCekiyrdg9xzxcs5bVJ0VDMtyVfw8="; + rev = "refs/tags/v${version}"; + hash = "sha256-/jRD0swNs59xugsXLbesGcTtyGdc/y/iwiDVoErW+d4="; }; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { postPatch = '' for file in src/libsync/vfs/*/CMakeLists.txt; do substituteInPlace $file \ - --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + --replace-fail "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" done ''; @@ -61,17 +61,17 @@ stdenv.mkDerivation rec { buildInputs = [ inotify-tools + kdePackages.kio libcloudproviders libsecret openssl pcre - plasma5Packages.kio + qt5compat qtbase qtkeychain + qtsvg qttools qtwebengine - qtquickcontrols2 - qtgraphicaleffects qtwebsockets sqlite ]; @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}"; description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01ceeab0ca8f..5ad02510f8f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10554,7 +10554,7 @@ with pkgs; }; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };