tjh.dev
nextcloud-client: 2.5.1 -> 2.5.2
* patches applied already, per comment \o/
* use libcloudproviders, since we have it
(cherry picked from commit e2dbb35cb13d27c4b52e57c771aa00a8bf36fb7b)
authored by
Will Dietz
and committed by
Linus Heckemann
fcc70979
926606ab
+4
-17
pkgs/applications/networking/nextcloud-client/default.nix
+4
-17
pkgs/applications/networking/nextcloud-client/default.nix
···
1
1
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
2
2
, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch
3
+
, libcloudproviders
3
4
}:
4
5
5
6
stdenv.mkDerivation rec {
6
7
name = "nextcloud-client-${version}";
7
-
version = "2.5.1";
8
+
version = "2.5.2";
8
9
9
10
src = fetchgit {
10
11
url = "git://github.com/nextcloud/desktop.git";
11
12
rev = "refs/tags/v${version}";
12
-
sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d";
13
+
sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr";
13
14
fetchSubmodules = true;
14
15
};
15
16
16
-
# Patches contained in next (>2.5.1) release
17
-
patches = [
18
-
(fetchpatch {
19
-
name = "fix-qt-5.12-build";
20
-
url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch";
21
-
sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n";
22
-
})
23
-
(fetchpatch {
24
-
name = "fix-qtwebengine-crash";
25
-
url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch";
26
-
sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0";
27
-
})
28
-
];
29
-
30
17
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
31
18
32
-
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
19
+
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ];
33
20
34
21
enableParallelBuilding = true;
35
22