From 60714e2cd319d3217e33397e65a63ad8beb4a8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 02:35:15 +0200 Subject: [PATCH 1/4] nextcloud-client: build dolphin plugin --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index deac64c903e1..4b3a68352416 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -2,6 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake +, extra-cmake-modules , inotify-tools , libcloudproviders , libsecret @@ -15,6 +16,7 @@ , qtwebsockets , qtquickcontrols2 , qtgraphicaleffects +, plasma5Packages , sqlite , inkscape , xdg-utils @@ -40,6 +42,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake + extra-cmake-modules inkscape ]; @@ -49,6 +52,7 @@ mkDerivation rec { libsecret openssl pcre + plasma5Packages.kio qtbase qtkeychain qttools From e532f3ecf44d0bbb7b6ae45a0e3e87ec4dc40b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 02:35:27 +0200 Subject: [PATCH 2/4] nextcloud-client: build man pages --- pkgs/applications/networking/nextcloud-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 4b3a68352416..5454765ad25c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,6 +4,7 @@ , cmake , extra-cmake-modules , inotify-tools +, installShellFiles , libcloudproviders , libsecret , openssl @@ -17,6 +18,7 @@ , qtquickcontrols2 , qtgraphicaleffects , plasma5Packages +, sphinx , sqlite , inkscape , xdg-utils @@ -44,6 +46,7 @@ mkDerivation rec { cmake extra-cmake-modules inkscape + sphinx ]; buildInputs = [ @@ -75,6 +78,10 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; + postBuild = '' + make doc-man + ''; + meta = with lib; { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; From 3bc98d3bc10f7bd4fd2df3b31b2eefb7fe26410c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 04:43:58 +0200 Subject: [PATCH 3/4] nextcloud-client: place vfs plugins in correct directory --- pkgs/applications/networking/nextcloud-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 5454765ad25c..018080e9efc0 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -41,6 +41,13 @@ mkDerivation rec { ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch ]; + postPatch = '' + for file in src/libsync/vfs/*/CMakeLists.txt; do + substituteInPlace $file \ + --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + done + ''; + nativeBuildInputs = [ pkg-config cmake From bd7d8adc321dae1c2c9f10989b49ec016f3d9eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 16 Apr 2022 05:13:51 +0200 Subject: [PATCH 4/4] nextcloud-client: split headers into dev output --- pkgs/applications/networking/nextcloud-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 018080e9efc0..3afdbec0ac54 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -28,6 +28,8 @@ mkDerivation rec { pname = "nextcloud-client"; version = "3.4.4"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop";