Merge pull request #136403 from remgodow/electron-mail-fix

This commit is contained in:
Sandro 2021-11-18 13:07:30 +01:00 committed by GitHub
commit 0b804a9217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,13 +1,13 @@
{ appimageTools, lib, fetchurl }: { appimageTools, lib, fetchurl, libsecret }:
let let
pname = "electron-mail"; pname = "electron-mail";
version = "4.12.2"; version = "4.12.7";
name = "ElectronMail-${version}"; name = "ElectronMail-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46";
}; };
appimageContents = appimageTools.extract { inherit name src; }; appimageContents = appimageTools.extract { inherit name src; };
@ -16,13 +16,16 @@ in appimageTools.wrapType2 {
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}' --replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
''; '';
extraPkgs = pkgs: with pkgs; [
libsecret
];
meta = with lib; { meta = with lib; {
description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
homepage = "https://github.com/vladimiry/ElectronMail"; homepage = "https://github.com/vladimiry/ElectronMail";