mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
Merge pull request #51044 from Ma27/use-libsecret-by-default-in-nextcloud-client
nextcloud-client: switch to libsecret and use it by default
This commit is contained in:
commit
f10f54b9c4
pkgs
|
@ -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; {
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
|
@ -4414,11 +4414,7 @@ in
|
||||||
|
|
||||||
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 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue