Move mcu into full flake-parts module

This commit is contained in:
Jack O'Sullivan 2024-08-31 15:00:30 +01:00
parent 1c500e015c
commit ea12d87356
3 changed files with 47 additions and 42 deletions

View File

@ -14,6 +14,8 @@
flake-parts.lib.mkFlake { inherit inputs; } {
imports = [
devenv.flakeModule
./mcu
];
systems = [ "x86_64-linux" ];
@ -26,14 +28,13 @@
rootFileContent = builtins.readFile rootdir.outPath;
in
pkgs.lib.mkIf (rootFileContent != "") rootFileContent;
withRootdir = f: mkMerge [
(import f)
{ devenv.root = rootdirOpt; }
];
in
{
devenv.shells = {
mcu = withRootdir mcu/devenv.nix;
_module.args.libMy = {
withRootdir = c: mkMerge [
c
{ devenv.root = rootdirOpt; }
];
};
};
};

40
mcu/default.nix Normal file
View File

@ -0,0 +1,40 @@
{
perSystem = { libMy, pkgs, ... }: {
devenv.shells.mcu = libMy.withRootdir {
packages = with pkgs; [
gnumake
cmake
pkgsCross.arm-embedded.buildPackages.gdb # ARM one is broken
gcc-arm-embedded
python3
picotool
openocd-rp2040
];
env = {
PICO_SDK_PATH = "${pkgs.pico-sdk}/lib/pico-sdk";
};
scripts = {
build.exec = ''
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -D PICO_STDIO_SEMIHOSTING=1
cmake --build build --parallel
'';
build-rel.exec = ''
cmake -S . -B build-release -D CMAKE_BUILD_TYPE=Release
cmake --build build-release --parallel
'';
clean.exec = ''
rm -rf build/ build-release/
'';
ocd.exec = ''
openocd -f ${./tigard-swd.cfg} -f target/rp2040.cfg
'';
gdb.exec = ''
arm-none-eabi-gdb -x .gdbinit build/qclk.elf
'';
};
};
};
}

View File

@ -1,36 +0,0 @@
{ pkgs, ... }: {
packages = with pkgs; [
gnumake
cmake
pkgsCross.arm-embedded.buildPackages.gdb # ARM one is broken
gcc-arm-embedded
python3
picotool
openocd-rp2040
];
env = {
PICO_SDK_PATH = "${pkgs.pico-sdk}/lib/pico-sdk";
};
scripts = {
build.exec = ''
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -D PICO_STDIO_SEMIHOSTING=1
cmake --build build --parallel
'';
build-rel.exec = ''
cmake -S . -B build-release -D CMAKE_BUILD_TYPE=Release
cmake --build build-release --parallel
'';
clean.exec = ''
rm -rf build/ build-release/
'';
ocd.exec = ''
openocd -f ${./tigard-swd.cfg} -f target/rp2040.cfg
'';
gdb.exec = ''
arm-none-eabi-gdb -x .gdbinit build/qclk.elf
'';
};
}