diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a94ca9efa292..6933c1bfb0f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21805,6 +21805,13 @@ github = "s0me1newithhand7s"; githubId = 117505144; }; + s0ssh = { + name = "s0ssh"; + email = "me@s0s.sh"; + github = "s0ssh"; + githubId = 168315776; + keys = [ { fingerprint = "1D34 4976 77AD 462C CA9F D5F1 FF16 29B1 3E89 9C1A"; } ]; + }; s1341 = { email = "s1341@shmarya.net"; matrix = "@s1341:matrix.org"; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index ff1c49ea1031..d5beef0bf130 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -2,20 +2,23 @@ lib, appimageTools, fetchurl, + makeWrapper, gitUpdater, }: appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "299.250725.1"; + version = "301.250806.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-nZ9LdXqGAEeCM/1tzfz0jnq6AyamobmP/vNgJoHjfhs="; + hash = "sha256-vnHw1cOvLuJZYxisVaF6sh5XBqlDiaCS3PLugbbNaKk="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; @@ -26,6 +29,9 @@ appimageTools.wrapType2 rec { substituteInPlace $out/share/applications/tutanota-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' + + wrapProgram $out/bin/tutanota-desktop \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; passthru.updateScript = gitUpdater { @@ -40,7 +46,10 @@ appimageTools.wrapType2 rec { changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + awwpotato + s0ssh + ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; };