From f295f49c26827e2e64399ae976555233855f54fd Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 5 Jul 2026 19:48:32 +0530
Subject: [PATCH] blink-qt: 6.0.4 -> 6.0.6

Diff: https://github.com/AGProjects/blink-qt/compare/6.0.4...6.0.6
Changelog: https://icanblink.com/changelog-linux/

blink-qt: fix none account crash on startup

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../bl/blink-qt/fix-none-account.patch        | 25 ++++++++
 pkgs/by-name/bl/blink-qt/package.nix          | 57 ++++++++++---------
 2 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/by-name/bl/blink-qt/fix-none-account.patch

diff --git a/pkgs/by-name/bl/blink-qt/fix-none-account.patch b/pkgs/by-name/bl/blink-qt/fix-none-account.patch
new file mode 100644
index 000000000000..d766d24ea265
--- /dev/null
+++ b/pkgs/by-name/bl/blink-qt/fix-none-account.patch
@@ -0,0 +1,25 @@
+From 6e438d1ab9f9da5e55b0cc96ea81fbac1f1a871b Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 5 Jul 2026 19:40:36 +0530
+Subject: [PATCH] fix: handle None default_account on startup
+
+---
+ blink/mainwindow.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/blink/mainwindow.py b/blink/mainwindow.py
+index d0baa21..77c67e8 100644
+--- a/blink/mainwindow.py
++++ b/blink/mainwindow.py
+@@ -1109,7 +1109,7 @@ class MainWindow(base_class, ui_class):
+ 
+     def _NH_SIPAccountManagerDidStart(self, notification):
+         account = notification.sender.default_account
+-        if account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized):
++        if account is not None and account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized):
+             self.export_pgp_key_action.setEnabled(True)
+ 
+     def _NH_SIPAccountManagerDidRemoveAccount(self, notification):
+-- 
+2.54.0
+
diff --git a/pkgs/by-name/bl/blink-qt/package.nix b/pkgs/by-name/bl/blink-qt/package.nix
index 45da889affe8..395bffbe4d39 100644
--- a/pkgs/by-name/bl/blink-qt/package.nix
+++ b/pkgs/by-name/bl/blink-qt/package.nix
@@ -5,26 +5,24 @@
   python3Packages,
   qt6Packages,
   libvncserver,
+  stdenv,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "blink-qt";
-  version = "6.0.4";
+  version = "6.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AGProjects";
     repo = "blink-qt";
     tag = finalAttrs.version;
-    hash = "sha256-QESg9yo5oddYqSKuFLSMI2Oju3FCq97+j0uJDK85Yy8=";
+    hash = "sha256-0hsuAYYp7KvfxErAcN4EX8G3goirGRmpijJfAMvbZJQ=";
   };
 
   patches = [
-    # Remove when version > 6.0.4
-    (fetchpatch2 {
-      url = "https://github.com/AGProjects/blink-qt/commit/45343c90ae0680a3d03589fa8a12ac1eb85a6925.patch";
-      hash = "sha256-XwV5L3r0IqWkhlaJypS2cHkDCcoumOgEEqDpdcaTviE=";
-    })
+    # Remove once https://github.com/AGProjects/blink-qt/pull/7 is mereged and tagged
+    ./fix-none-account.patch
   ];
 
   nativeBuildInputs = [ qt6Packages.wrapQtAppsHook ];
@@ -40,26 +38,31 @@ python3Packages.buildPythonApplication (finalAttrs: {
     qt6Packages.qtsvg
   ];
 
-  dependencies = with python3Packages; [
-    dateutils
-    dnspython
-    google-api-python-client
-    lxml
-    lxml-html-clean
-    msrplib
-    oauth2client
-    otr
-    pgpy
-    pyqt6
-    pyqt6-webengine
-    python3-application
-    python3-eventlib
-    python3-gnutls
-    python3-sipsimple
-    sqlobject
-    standard-imghdr
-    xcaplib
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      dateutils
+      dnspython
+      google-auth-oauthlib
+      google-api-python-client
+      lxml
+      lxml-html-clean
+      msrplib
+      otr
+      pgpy
+      pyqt6
+      pyqt6-webengine
+      python3-application
+      python3-eventlib
+      python3-gnutls
+      python3-sipsimple
+      sqlobject
+      standard-imghdr
+      xcaplib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      numpy
+    ];
 
   dontWrapQtApps = true;