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

Merge pull request #55673 from averelld/fix-nextcloud-crash

Browse Source 
nextcloud-client: fix crash
This commit is contained in:
Florian Klink 2019-02-13 12:31:51 +01:00 committed by GitHub
commit 3627e56b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 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

@ -13,13 +13,18 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
# Patch contained in next (>2.5.1) release # Patches contained in next (>2.5.1) release
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "fix-qt-5.12-build"; name = "fix-qt-5.12-build";
url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch";
sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n";
}) })
(fetchpatch {
name = "fix-qtwebengine-crash";
url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch";
sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0";
})
]; ];
nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ];