From fd8220a8b2116bf312a2618cae21ec99e76c9147 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 23 Dec 2025 15:47:16 +1100
Subject: [PATCH 1/3] simgear: 2024.1.1 -> 2024.1.3

Release notes: https://wiki.flightgear.org/Changelog_2024.1#2024.1.3
---
 pkgs/by-name/si/simgear/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index 21183bb8f83c..46bf323252e3 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -25,9 +25,10 @@
   apr,
   xz,
   curl,
+  c-ares,
 }:
 let
-  version = "2024.1.1";
+  version = "2024.1.3";
 in
 stdenv.mkDerivation rec {
   pname = "simgear";
@@ -36,8 +37,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "flightgear";
     repo = "simgear";
-    tag = "v${version}";
-    hash = "sha256-hOA/q/cTsqRy82rTAXRxyHBDdw93TW9UL+K5Jq5b/08=";
+    tag = "${version}";
+    hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -66,6 +67,8 @@ stdenv.mkDerivation rec {
     xz
   ];
 
+  propagatedBuildInputs = [ c-ares ];
+
   meta = {
     description = "Simulation construction toolkit";
     homepage = "https://wiki.flightgear.org/SimGear";

From b4a87e5e2db8720a29d1f5e9091ca8c80574d334 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 23 Dec 2025 15:50:26 +1100
Subject: [PATCH 2/3] flightgear: 2024.1.1 -> 2024.1.3

Release notes: https://wiki.flightgear.org/Changelog_2024.1#2024.1.3
---
 pkgs/by-name/fl/flightgear/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index e7dff70ac77d..dccb5368339a 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -33,7 +33,7 @@
 }:
 
 let
-  version = "2024.1.1";
+  version = "2024.1.3";
   data = stdenv.mkDerivation rec {
     pname = "flightgear-data";
     inherit version;
@@ -41,8 +41,8 @@ let
     src = fetchFromGitLab {
       owner = "flightgear";
       repo = "fgdata";
-      tag = "v${version}";
-      hash = "sha256-PdqsIZw9mSrvnqqB/fVFjWPW9njhXLWR/2LQCMoBLQI=";
+      tag = "${version}";
+      hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c=";
     };
 
     dontUnpack = true;
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     owner = "flightgear";
     repo = "flightgear";
-    tag = "v${version}";
-    hash = "sha256-h4N18VAbJGQSBKA+eEQxej5e5MEwAcZpvH+dpTypM+k=";
+    tag = "${version}";
+    hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A=";
   };
 
   nativeBuildInputs = [

From 81cbc50edb11df8885a01325284222a41d0a9f17 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 23 Dec 2025 16:22:24 +1100
Subject: [PATCH 3/3] flightgear: remove redundant appdir directory

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

diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index dccb5368339a..d2d05b651f0d 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -104,6 +104,11 @@ stdenv.mkDerivation rec {
 
   qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
+  postInstall = ''
+    # Remove redundant AppImage artifacts
+    rm -rf "$out/appdir"
+  '';
+
   meta = {
     description = "Flight simulator";
     maintainers = with lib.maintainers; [ raskin ];