From f1546d06900f5c3d1d74baa0e9cd112006373264 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:12:47 -0500
Subject: [PATCH 1/2] firebird-emu: migrate to by-name

---
 .../fi/firebird-emu/package.nix}                 | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/emulators/firebird-emu/default.nix => by-name/fi/firebird-emu/package.nix} (86%)

diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/by-name/fi/firebird-emu/package.nix
similarity index 86%
rename from pkgs/applications/emulators/firebird-emu/default.nix
rename to pkgs/by-name/fi/firebird-emu/package.nix
index 5ec7352d5774..ce6fd7b7ebf9 100644
--- a/pkgs/applications/emulators/firebird-emu/default.nix
+++ b/pkgs/by-name/fi/firebird-emu/package.nix
@@ -2,11 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtdeclarative,
-  qtquickcontrols,
-  wrapQtAppsHook,
+  qt5,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "firebird-emu";
@@ -21,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qmake
+    qt5.wrapQtAppsHook
+    qt5.qmake
   ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtquickcontrols
+    qt5.qtbase
+    qt5.qtdeclarative
+    qt5.qtquickcontrols
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30cc67350b58..d59d23cf70ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1249,8 +1249,6 @@ with pkgs;
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 
-  firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
-
   gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
 
   goldberg-emu = callPackage ../applications/emulators/goldberg-emu {

From b6c52b0be225f675ac2e4a055399965b6aaa3ee0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:13:37 -0500
Subject: [PATCH 2/2] firebird-emu: switch from rev to tag

---
 pkgs/by-name/fi/firebird-emu/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/firebird-emu/package.nix b/pkgs/by-name/fi/firebird-emu/package.nix
index ce6fd7b7ebf9..fdde0dd9a3f6 100644
--- a/pkgs/by-name/fi/firebird-emu/package.nix
+++ b/pkgs/by-name/fi/firebird-emu/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "nspire-emus";
     repo = "firebird";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
   };