nextcloud-client: fix build after qt updates
Probably necessary after restructuring/updates in #31462
This commit is contained in:
parent
7484d9c865
commit
cce47a6bf5
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite
|
||||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
|
||||
, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [ ./find-sql.patch ];
|
||||
patchFlags = "-d client -p1";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain qttools sqlite ]
|
||||
++ stdenv.lib.optional stdenv.isLinux inotify-tools
|
||||
++ stdenv.lib.optional withGnomeKeyring makeWrapper;
|
||||
|
||||
|
|
12
pkgs/applications/networking/nextcloud-client/find-sql.patch
Normal file
12
pkgs/applications/networking/nextcloud-client/find-sql.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
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)
|
|
@ -3561,7 +3561,7 @@ with pkgs;
|
|||
|
||||
nextcloud = callPackage ../servers/nextcloud { };
|
||||
|
||||
nextcloud-client = libsForQt56.callPackage ../applications/networking/nextcloud-client { };
|
||||
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
|
||||
|
||||
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue