From 9d7901340ab14d3ea6db761a11728c88e3af6446 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 15:30:27 -0700 Subject: [PATCH 1/5] tutanota-desktop: add electron ozone flags (cherry picked from commit 181ba5f166189864b3a53a82a60b3c2d2d4dc899) --- pkgs/by-name/tu/tutanota-desktop/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index ff1c49ea1031..2ffea6e5a7e7 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -2,6 +2,7 @@ lib, appimageTools, fetchurl, + makeWrapper, gitUpdater, }: @@ -16,6 +17,8 @@ appimageTools.wrapType2 rec { 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 { From 7197c3479696bcfe845b3a35d616b9aa8f09be10 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 5 Aug 2025 15:30:50 -0700 Subject: [PATCH 2/5] tutanota-desktop: add awwpotato as maintainer (cherry picked from commit a7cc6431ebbe249b32d123b3a827c01c602c5743) --- pkgs/by-name/tu/tutanota-desktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 2ffea6e5a7e7..b8a4041f7867 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -46,7 +46,7 @@ appimageTools.wrapType2 rec { changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.awwpotato ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; }; From ff53e487ddad86ac38dc12ef2c834c5e1cbf8d8e Mon Sep 17 00:00:00 2001 From: s0ssh Date: Wed, 20 Aug 2025 16:00:59 -0500 Subject: [PATCH 3/5] tutanota-desktop: 299.250725.1 -> 301.250806.1 (cherry picked from commit 61accd1d09b6269bed42aaf792466152d60e4859) --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index b8a4041f7867..200bb529de23 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -8,11 +8,11 @@ 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 ]; From b30d6b1030f2c80c91c991aeaf13377af53f10e9 Mon Sep 17 00:00:00 2001 From: s0ssh Date: Wed, 20 Aug 2025 16:06:01 -0500 Subject: [PATCH 4/5] maintainers: add s0ssh (cherry picked from commit feb7fb167804cb9378a1ac67d674c806e3636437) --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e96d75e1aeb..912d2a762e84 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21792,6 +21792,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"; From 38f6c9967dcf58965c8021370f97bbbdf99e0959 Mon Sep 17 00:00:00 2001 From: s0ssh Date: Wed, 20 Aug 2025 16:10:45 -0500 Subject: [PATCH 5/5] tutanota-desktop: adopt (cherry picked from commit f1bd6cc5832761dc9cf93ff5ffb1aaf5331b9324) --- maintainers/maintainer-list.nix | 10 +++++----- pkgs/by-name/tu/tutanota-desktop/package.nix | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 912d2a762e84..fd0d49694adf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21793,11 +21793,11 @@ 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"; } ]; + 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"; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 200bb529de23..d5beef0bf130 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -46,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 = [ lib.maintainers.awwpotato ]; + maintainers = with lib.maintainers; [ + awwpotato + s0ssh + ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; };