From e62706860a547681df8bde7a657d9c364325a2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 15 Jul 2024 08:41:37 -0400
Subject: [PATCH 1/2] birdtray: move to by-name

---
 .../bi/birdtray/package.nix}                  | 28 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 14 deletions(-)
 rename pkgs/{applications/misc/birdtray/default.nix => by-name/bi/birdtray/package.nix} (73%)

diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/by-name/bi/birdtray/package.nix
similarity index 73%
rename from pkgs/applications/misc/birdtray/default.nix
rename to pkgs/by-name/bi/birdtray/package.nix
index cbdb165a64847..38f2e11acd988 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -1,15 +1,12 @@
-{ mkDerivation
-  , lib
-  , fetchFromGitHub
-
-  , cmake
-  , pkg-config
-  , qtbase
-  , qttools
-  , qtx11extras
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libsForQt5
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "birdtray";
   version = "1.11.4";
 
@@ -20,9 +17,16 @@ mkDerivation rec {
     sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
+
   buildInputs = [
-    qtbase qttools qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
   ];
 
   # Wayland support is broken.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e74e5060f2e73..4f05e0af17d9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4213,8 +4213,6 @@ with pkgs;
 
   binwalk = with python3Packages; toPythonApplication binwalk;
 
-  birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
-
   blitz = callPackage ../development/libraries/blitz { };
 
   blockbook = callPackage ../servers/blockbook { };

From f11390ea2510982c2224371125c76891b06d83de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 15 Jul 2024 08:47:37 -0400
Subject: [PATCH 2/2] birdtray: fix PATH handling

---
 pkgs/by-name/bi/birdtray/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/bi/birdtray/package.nix b/pkgs/by-name/bi/birdtray/package.nix
index 38f2e11acd988..04d45a8973b2e 100644
--- a/pkgs/by-name/bi/birdtray/package.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -4,6 +4,8 @@
 , cmake
 , pkg-config
 , libsForQt5
+, fetchpatch
+, thunderbird
 }:
 
 stdenv.mkDerivation rec {
@@ -29,6 +31,18 @@ stdenv.mkDerivation rec {
     libsForQt5.qtx11extras
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "OPT_THUNDERBIRD_CMDLINE" "thunderbird") # get thunderbird from PATH
+  ];
+
+  patches = [
+    (fetchpatch {
+      name = "fix-path-handling.patch";
+      url = "https://github.com/gyunaev/birdtray/commit/54b304d92188429792c264b07ff45897699f2d3e.patch";
+      hash = "sha256-ME635Kt1b9RJKCqtAZBFa93OIA0u2Z4tWIlGcI374j0=";
+    })
+  ];
+
   # Wayland support is broken.
   # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
   qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];