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

Merge pull request #51044 from Ma27/use-libsecret-by-default-in-nextcloud-client

Browse Source 
nextcloud-client: switch to libsecret and use it by default
This commit is contained in:
Jan Tojnar 2018-12-18 00:35:49 +01:00 committed by GitHub
commit f10f54b9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -1,5 +1,5 @@
{ 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 {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
postInstall = ''
sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
$out/share/applications/nextcloud.desktop
wrapProgram "$out/bin/nextcloud" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}
'';
meta = with stdenv.lib; {

14
pkgs/applications/networking/nextcloud-client/wrapper.nix
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;
}

6
pkgs/top-level/all-packages.nix
View File

@ -4414,11 +4414,7 @@ in
nextcloud = callPackage ../servers/nextcloud { };
nextcloud-client-unwrapped = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-client = callPackage ../applications/networking/nextcloud-client/wrapper.nix {
nextcloud-client = nextcloud-client-unwrapped;
};
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };