From 917c694477cf6a53c5f5bdd7217c5e26607fc47a Mon Sep 17 00:00:00 2001
From: gsubmarine <gouthpromo@gmail.com>
Date: Mon, 20 Jan 2025 22:01:37 -0500
Subject: [PATCH] fix(nix): remove result folder. remove unecessary includes.
 Point ardusim to side branch with linux build patch

---
 Tools/nix/ardupilot-firmware.nix | 4 +---
 Tools/nix/ardupilot-sim.nix      | 6 +++---
 result                           | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 120000 result

diff --git a/Tools/nix/ardupilot-firmware.nix b/Tools/nix/ardupilot-firmware.nix
index 5ab413c3d2a9d..bff14356a6e3b 100644
--- a/Tools/nix/ardupilot-firmware.nix
+++ b/Tools/nix/ardupilot-firmware.nix
@@ -20,9 +20,7 @@ in flake-utils.lib.eachSystem supported-systems (system:
         python
         pkgs.git
         pkgs.rsync
-        pkgs.gcc-arm-embedded
         pkgs.gcc_multi
-        pkgs.wafHook
       ];
       patches = [
         ./patches/ardusim_patches/runnable_status.patch
@@ -54,4 +52,4 @@ in flake-utils.lib.eachSystem supported-systems (system:
         cp Tools/scripts/uploader.py $out/bin/ardupilot-fw-flasher
       '';
     };
-  })
\ No newline at end of file
+  })
diff --git a/Tools/nix/ardupilot-sim.nix b/Tools/nix/ardupilot-sim.nix
index 03d6c6a94f149..edb115369ecea 100644
--- a/Tools/nix/ardupilot-sim.nix
+++ b/Tools/nix/ardupilot-sim.nix
@@ -15,9 +15,9 @@ in flake-utils.lib.eachSystem supported-systems (system:
       ardusim = pkgs.stdenv.mkDerivation {
         name = "ardusim";
         src = builtins.fetchGit {
-          url = "https://github.com/ArduPilot/ardupilot.git";
-          rev = "df2be63e21217b626be53c7c9e98f37410b12126";
-          ref = "Rover-4.4";
+          url = "https://github.com/gsubmarine/ardupilot.git";
+          rev = "45c9dad0e5f0868423c9853570039798897b1aec";
+          ref = "Rover4.4_builderror_patch";
           submodules = true;
         };
         buildInputs = [ python pkgs.git pkgs.rsync pkgs.gcc ];
diff --git a/result b/result
deleted file mode 120000
index 257c2323c0318..0000000000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/48h7ymfg49vg29f1viamb17hkxqcg28s-ardusim
\ No newline at end of file