b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nextcloud-client: fix build after qt updates

Browse source 
Probably necessary after restructuring/updates in #31462
This commit is contained in:
Averell Dalton 2017-11-20 06:57:36 +01:00 committed by Bjørn Forsman
parent 7484d9c865
commit cce47a6bf5
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -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
View 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)

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };