alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nextcloud-client: 3.0.3 -> 3.1.3

Browse source 
Updated to the latest version and add qtwebsockets for cmake errors and libsecret for ld errors

Remove qtWrapperArgs for libsecret

Comment patch and fix license

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
This commit is contained in:
Bryan A. S 2021-02-19 19:53:17 -03:00
parent dc0e2bfd78
commit 4515dfb6a2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/nextcloud-client/default.nix
View file

@ -12,6 +12,7 @@
, qtkeychain , qtkeychain
, qttools , qttools
, qtwebengine , qtwebengine
, qtwebsockets
, qtquickcontrols2 , qtquickcontrols2
, qtgraphicaleffects , qtgraphicaleffects
, sqlite , sqlite
@ -19,16 +20,17 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "3.0.3"; version = "3.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "0idh8i71jivdjjs2y62l22yl3qxwgcr0hf53dad587bzgkkkr223"; sha256 = "sha256-8Ql6tOvWOjAvMJA87WlT9TbpnbciBsjDxRuYlMVi/m8=";
}; };
patches = [ patches = [
# Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
]; ];
@ -40,6 +42,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
inotify-tools inotify-tools
libcloudproviders libcloudproviders
libsecret
openssl openssl
pcre pcre
qtbase qtbase
@ -48,13 +51,10 @@ mkDerivation rec {
qtwebengine qtwebengine
qtquickcontrols2 qtquickcontrols2
qtgraphicaleffects qtgraphicaleffects
qtwebsockets
sqlite sqlite
]; ];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
@ -63,7 +63,7 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Nextcloud themed desktop client"; description = "Nextcloud themed desktop client";
homepage = "https://nextcloud.com"; homepage = "https://nextcloud.com";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ caugner ]; maintainers = with maintainers; [ caugner ];
platforms = platforms.linux; platforms = platforms.linux;
}; };