JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39566 from bfortz/owncloud-2.4.1

Browse Source 
owncloud-client: 2.3.4 -> 2.4.1
This commit is contained in:
xeji 2018-05-09 21:43:03 +02:00 committed by GitHub
commit 96c2cad2dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.3.4";
version = "2.4.1";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49";
sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
};
patches = [ ../nextcloud-client/find-sql.patch ];
patches = [ ./find-sql.patch ];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];

12
pkgs/applications/networking/owncloud-client/find-sql.patch Normal file
View File

@ -0,0 +1,12 @@
*** a/cmake/modules/QtVersionAbstraction.cmake
--- b/cmake/modules/QtVersionAbstraction.cmake
***************
*** 8,13 ****
--- 8,14 ----
find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5Xml REQUIRED)
+ find_package(Qt5Sql REQUIRED)
find_package(Qt5Concurrent REQUIRED)
if(UNIT_TESTING)
find_package(Qt5Test REQUIRED)