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

nextcloud-client: switch to libsecret and use it by default

Browse Source 
This change makes it easier for users to setup the nextcloud client with
GNOME keyring support as discussed in the IRC[1][2].

Additionaly we now use `libsecret` instead of `libgnome-keyring` which
integrates better in a GNOME setup (libgnome-keyring defaults to the
Gnome2 library)[3].

[1] https://logs.nix.samueldr.com/nixos/2018-11-24#1745871;
[2] https://logs.nix.samueldr.com/nixos/2018-11-24#1746033;
[3] #38266
This commit is contained in:
Maximilian Bosch
2018-11-25 21:47:32 +01:00
parent 21773f1d43
commit c6913213eb
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/nextcloud-client/default.nix
+6 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
, inotify-tools, makeWrapper, libgnome-keyring, openssl_1_1, pcre, qtwebengine , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
@@ -32,7 +32,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
$out/share/applications/nextcloud.desktop $out/share/applications/nextcloud.desktop
wrapProgram "$out/bin/nextcloud" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/applications/networking/nextcloud-client/wrapper.nix
-14
View File
@@ -1,14 +0,0 @@
{ lib, nextcloud-client, makeWrapper, symlinkJoin, withGnomeKeyring ? false, libgnome-keyring }:
if (!withGnomeKeyring) then nextcloud-client else symlinkJoin {
name = "${nextcloud-client.name}-with-gnome-keyring";
paths = [ nextcloud-client ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram "$out/bin/nextcloud" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgnome-keyring ]}
'';
inherit (nextcloud-client) meta;
}
pkgs/top-level/all-packages.nix
+1 -5
View File
@@ -4388,11 +4388,7 @@ with pkgs;
nextcloud = callPackage ../servers/nextcloud { }; nextcloud = callPackage ../servers/nextcloud { };
nextcloud-client-unwrapped = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-client = callPackage ../applications/networking/nextcloud-client/wrapper.nix {
nextcloud-client = nextcloud-client-unwrapped;
};
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };