nextcloud-client: fix build after qt updates

Probably necessary after restructuring/updates in #31462
NixOS · Nov 20, 2017 · cce47a6 · cce47a6
1 parent 7484d9c
commit cce47a6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -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;
 

diff --git a/pkgs/applications/networking/nextcloud-client/find-sql.patch b/pkgs/applications/networking/nextcloud-client/find-sql.patch
@@ -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)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -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 { };