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.
This commit is contained in:
parent
4ce18c8367
commit
e828dcb5cd
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite
|
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite
|
||||||
, inotify-tools }:
|
, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nextcloud-client-${version}";
|
name = "nextcloud-client-${version}";
|
||||||
@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig cmake ];
|
nativeBuildInputs = [ pkgconfig cmake ];
|
||||||
|
|
||||||
buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
@ -31,6 +33,11 @@ stdenv.mkDerivation rec {
|
|||||||
"-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include"
|
"-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; {
|
meta = with stdenv.lib; {
|
||||||
description = "Nextcloud themed desktop client";
|
description = "Nextcloud themed desktop client";
|
||||||
homepage = https://nextcloud.com;
|
homepage = https://nextcloud.com;
|
||||||
|
Loading…
Reference in New Issue
Block a user