nextcloud-client: 2.3.3 -> 2.5.0 (#50463)
Updates to the latest version of the desktop client available. Tested the config migration from `nextcloud-client` 2.3.3 with a Nextcloud 14.0.3 instance (hosted using `services.nextcloud`). Additionally the derivation required the following changes: * Dropped `Qt5Sql` patch: this has been fixed upstream and isn't needed anymore (furthermore their CMake structure has changed and the patch wouldn't apply anymore on 2.5.0). * Moved to a new upstream repository (nextcloud/desktop), kept `fetchgit` to properly fetch submodules. * Added OpenSSL 1.1 integration: `libsync` (the syncing provided by this package) requires 1.1, furthermore the linking flags had to be fixed manually by passing `NIX_LDFLAGS` to the derivation. Furthermore I moved the support for a Gnome3 keyring into its own wrapper to avoid a full rebuild of the package whenever you alter `withGnomeKeyring` in an override expressions. It's still possible to enable keyring (now without recompile) like this: ``` nextcloud-client.override { withGnomeKeyring = true; } ``` To override the derivation itself you now have to use `nextcloud-client-unwrapped`: ``` nextcloud-client-unwrapped.overrideAttrs (old: { src = yoursrc; }) ```wip/yesman
parent
24b381e235
commit
e75f922e91
@ -1,12 +0,0 @@ |
||||
diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
|
||||
index 5bd853c84..93ddf3cf8 100644
|
||||
--- a/cmake/modules/QtVersionAbstraction.cmake
|
||||
+++ b/cmake/modules/QtVersionAbstraction.cmake
|
||||
@@ -17,6 +17,7 @@ if( Qt5Core_FOUND )
|
||||
message(STATUS "Found Qt5 core, checking for further dependencies...")
|
||||
find_package(Qt5Network REQUIRED)
|
||||
find_package(Qt5Xml REQUIRED)
|
||||
+ find_package(Qt5Sql REQUIRED)
|
||||
find_package(Qt5Concurrent REQUIRED)
|
||||
if(UNIT_TESTING)
|
||||
find_package(Qt5Test REQUIRED)
|
@ -0,0 +1,14 @@ |
||||
{ lib, nextcloud-client, makeWrapper, symlinkJoin, withGnomeKeyring ? false, libgnome-keyring }: |
||||
|
||||
if (!withGnomeKeyring) then nextcloud-client else symlinkJoin { |
||||
name = "${nextcloud-client.name}-with-gnome-keyring"; |
||||
paths = [ nextcloud-client ]; |
||||
nativeBuildInputs = [ makeWrapper ]; |
||||
|
||||
postBuild = '' |
||||
wrapProgram "$out/bin/nextcloud" \ |
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgnome-keyring ]} |
||||
''; |
||||
|
||||
inherit (nextcloud-client) meta; |
||||
} |
Loading…
Reference in new issue