diff options
| author | Averell Dalton <averell@rxd4.com> | 2017-11-20 06:57:36 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-11-20 08:10:40 +0100 |
| commit | cce47a6bf5013b2cb146e70fdb2adadbadcdb118 (patch) | |
| tree | af903546e4b04a1e158ce44540e024e1d0105e33 /pkgs/applications/networking/nextcloud-client | |
| parent | 7484d9c8652255d4c4ea02da108434513b961961 (diff) | |
| download | nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar.gz nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar.bz2 nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar.lz nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar.xz nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.tar.zst nixlib-cce47a6bf5013b2cb146e70fdb2adadbadcdb118.zip | |
nextcloud-client: fix build after qt updates
Probably necessary after restructuring/updates in #31462
Diffstat (limited to 'pkgs/applications/networking/nextcloud-client')
| -rw-r--r-- | pkgs/applications/networking/nextcloud-client/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/nextcloud-client/find-sql.patch | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 081f765a3e87..652de194a5e7 100644 --- 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 new file mode 100644 index 000000000000..baf6a4fbf491 --- /dev/null +++ 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) |