diff options
Diffstat (limited to 'pkgs/applications/networking/nextcloud-client/default.nix')
-rw-r--r-- | pkgs/applications/networking/nextcloud-client/default.nix | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 6ed5e63cd0f..3d54ff3a7c3 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,37 +1,31 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }: +, inotify-tools, makeWrapper, libgnome-keyring, openssl_1_1, pcre, qtwebengine +}: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.3.3"; + version = "2.5.0"; src = fetchgit { - url = "git://github.com/nextcloud/client_theming.git"; - rev = "ab40efe1e1475efddd636c09251d8917627261da"; - sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip"; + url = "git://github.com/nextcloud/desktop.git"; + rev = "refs/tags/v${version}"; + sha256 = "1wz5bz4nmni0qxzcvgmpg9ywrfixzvdd7ixgqmdm4d8g6dm8pk9k"; fetchSubmodules = true; }; - patches = [ ./find-sql.patch ]; - patchFlags = "-d client -p1"; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools sqlite ] - ++ stdenv.lib.optional stdenv.isLinux inotify-tools - ++ stdenv.lib.optional withGnomeKeyring makeWrapper; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; enableParallelBuilding = true; - dontUseCmakeBuildDir = true; - - cmakeDir = "client"; + NIX_LDFLAGS = "${openssl_1_1.out}/lib/libssl.so ${openssl_1_1.out}/lib/libcrypto.so"; cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DCMAKE_BUILD_TYPE=Release" - "-DOEM_THEME_DIR=${src}/nextcloudtheme" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + "-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" + "-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; @@ -39,16 +33,13 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ $out/share/applications/nextcloud.desktop - '' + stdenv.lib.optionalString (withGnomeKeyring) '' - wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]} ''; meta = with stdenv.lib; { description = "Nextcloud themed desktop client"; homepage = https://nextcloud.com; license = licenses.gpl2; - maintainers = with maintainers; [ caugner ]; + maintainers = with maintainers; [ caugner ma27 ]; platforms = platforms.linux; }; } |