From e828dcb5cd4ae321dde053d2eb3a24992b42f167 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 13 Sep 2017 08:59:16 +0930 Subject: [PATCH] nextcloud-client: provide optional gnome-keyring integration `qtkeyring` can use `gnome-keyring`, but it needs some help to find it. I have not enabled this by default because not everyone who uses this will want to pull in GNOME dependencies. --- .../networking/nextcloud-client/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index aa6bb6d884c7..081f765a3e87 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite -, inotify-tools }: +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ qtbase qtwebkit qtkeychain sqlite ] - ++ stdenv.lib.optional stdenv.isLinux inotify-tools; + ++ stdenv.lib.optional stdenv.isLinux inotify-tools + ++ stdenv.lib.optional withGnomeKeyring makeWrapper; enableParallelBuilding = true; @@ -31,6 +33,11 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; + postInstall = 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;