Skip to content

Commit

Permalink
fix(nix): remove result folder. remove unecessary includes. Point ard…
Browse files Browse the repository at this point in the history
…usim to side branch with linux build patch
  • Loading branch information
gsubmarine committed Jan 21, 2025
1 parent 764216b commit 917c694
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 1 addition & 3 deletions Tools/nix/ardupilot-firmware.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,4 +52,4 @@ in flake-utils.lib.eachSystem supported-systems (system:
cp Tools/scripts/uploader.py $out/bin/ardupilot-fw-flasher
'';
};
})
})
6 changes: 3 additions & 3 deletions Tools/nix/ardupilot-sim.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
1 change: 0 additions & 1 deletion result

This file was deleted.

0 comments on commit 917c694

Please sign in to comment.