pyrox.dev / nixpkgs
lol
fork atom

nextcloud-client: fix build after qt updates

Probably necessary after restructuring/updates in #31462

authored by Averell Dalton and committed by Bjørn Forsman cce47a6b 7484d9c8

+18 -3
unified split
+5 -2
pkgs/applications/networking/nextcloud-client/default.nix
··· 1 - { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite 1 + { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite 2 2 , inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: 3 3 4 4 stdenv.mkDerivation rec { ··· 12 12 fetchSubmodules = true; 13 13 }; 14 14 15 + patches = [ ./find-sql.patch ]; 16 + patchFlags = "-d client -p1"; 17 + 15 18 nativeBuildInputs = [ pkgconfig cmake ]; 16 19 17 - buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] 20 + buildInputs = [ qtbase qtwebkit qtkeychain qttools sqlite ] 18 21 ++ stdenv.lib.optional stdenv.isLinux inotify-tools 19 22 ++ stdenv.lib.optional withGnomeKeyring makeWrapper; 20 23
+12
pkgs/applications/networking/nextcloud-client/find-sql.patch
··· 1 + diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake 2 + index 5bd853c84..93ddf3cf8 100644 3 + --- a/cmake/modules/QtVersionAbstraction.cmake 4 + +++ b/cmake/modules/QtVersionAbstraction.cmake 5 + @@ -17,6 +17,7 @@ if( Qt5Core_FOUND ) 6 + message(STATUS "Found Qt5 core, checking for further dependencies...") 7 + find_package(Qt5Network REQUIRED) 8 + find_package(Qt5Xml REQUIRED) 9 + + find_package(Qt5Sql REQUIRED) 10 + find_package(Qt5Concurrent REQUIRED) 11 + if(UNIT_TESTING) 12 + find_package(Qt5Test REQUIRED)
+1 -1
pkgs/top-level/all-packages.nix
··· 3561 3561 3562 3562 nextcloud = callPackage ../servers/nextcloud { }; 3563 3563 3564 - nextcloud-client = libsForQt56.callPackage ../applications/networking/nextcloud-client { }; 3564 + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; 3565 3565 3566 3566 nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; 3567 3567