From b1571315968abf863ca7de7bd7b6500805f69d6c Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 27 Sep 2022 21:00:06 -0700
Subject: whalebird: 4.6.0 -> 4.6.5

also pin the electron version to that specified upstream, otherwise
certain basic features like the login prompt do not show.

changelog: <https://github.com/h3poteto/whalebird-desktop/releases>

notable changes:
- add Persian translations
- update electron 17.3.0 -> 19.0.5
- display emoji reaction notifications in notifications timeline
- enable shortcuts to reload timeline and change focus

bugfixes:
- fix deleting tag timeline
- fix clearing notification dot on mention
- fix loading of ListMembership modal
- fix focus of NewToot modal
- fix closing sideBar
- fix z-index for knob and image modal
- fix en translation for sensitive contents
- Fix i18next when application is loaded
- fix visibility of boosted status

and about a hundred dependency updates :^)
---
 pkgs/applications/misc/whalebird/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index 3972d7a17230..b42fbe12ffeb 100644
--- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "whalebird";
-  version = "4.6.0";
+  version = "4.6.5";
 
   src = let
     downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2";
-        sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8";
+        sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0=";
       }
     else if stdenv.system == "aarch64-linux" then
       fetchurl {
         url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2";
-        sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974";
+        sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc=";
       }
     else
       throw "Whalebird is not supported for ${stdenv.system}";
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     # Necessary steps to find the tray icon
     asar extract opt/Whalebird/resources/app.asar "$TMP/work"
     substituteInPlace $TMP/work/dist/electron/main.js \
-      --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
+      --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\""
     asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar
 
     runHook postBuild
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce48c83e2198..1b706acc51cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32339,7 +32339,9 @@ with pkgs;
 
   weston = callPackage ../applications/window-managers/weston { };
 
-  whalebird = callPackage ../applications/misc/whalebird { };
+  whalebird = callPackage ../applications/misc/whalebird {
+    electron = electron_19;
+  };
 
   wio = callPackage ../applications/window-managers/wio {
     wlroots = wlroots_0_14;
-- 
cgit v1.2.3