From e41a5aeeb4fdb684406cc2eb9a47c7e565c39f75 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 17 Oct 2025 18:48:47 -0300
Subject: [PATCH 1/2] flightgear: move to by-name and modernize

---
 .../flightgear/openscenegraph-flightgear.nix  |  0
 .../fl/flightgear/package.nix}                | 21 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{games => by-name/fl}/flightgear/openscenegraph-flightgear.nix (100%)
 rename pkgs/{games/flightgear/default.nix => by-name/fl/flightgear/package.nix} (86%)

diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
similarity index 100%
rename from pkgs/games/flightgear/openscenegraph-flightgear.nix
rename to pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/by-name/fl/flightgear/package.nix
similarity index 86%
rename from pkgs/games/flightgear/default.nix
rename to pkgs/by-name/fl/flightgear/package.nix
index 42c793c335b6..e7dff70ac77d 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  wrapQtAppsHook,
   callPackage,
   libglut,
   freealut,
@@ -28,9 +27,7 @@
   udev,
   fltk13,
   apr,
-  qtbase,
-  qtquickcontrols2,
-  qtdeclarative,
+  qt5,
   glew,
   curl,
 }:
@@ -71,7 +68,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     libglut
@@ -98,21 +95,21 @@ stdenv.mkDerivation rec {
     udev
     fltk13
     apr
-    qtbase
-    qtquickcontrols2
+    qt5.qtbase
+    qt5.qtquickcontrols2
     glew
-    qtdeclarative
+    qt5.qtdeclarative
     curl
   ];
 
   qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
-  meta = with lib; {
+  meta = {
     description = "Flight simulator";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "fgfs";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb14a45b91d..e27102d88118 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,8 +13382,6 @@ with pkgs;
 
   factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { };
-
   freeciv = callPackage ../by-name/fr/freeciv/package.nix {
     sdl2Client = false;
     gtkClient = true;

From c4d5904e1269ee70d20b728c5fcd90b884cf77fd Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 17 Oct 2025 18:52:45 -0300
Subject: [PATCH 2/2] flightgear: add maintainer iedame

---
 pkgs/by-name/fl/flightgear/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index e7dff70ac77d..056b3269774a 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -106,7 +106,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Flight simulator";
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
     license = lib.licenses.gpl2Plus;