nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix targets for flake, add kernel 6.6.34

Browse source
This commit is contained in:
adminy 2024-06-23 16:43:11 +01:00
parent 57a532319e
commit b027897628
7 changed files with 97 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpi/default.nix
View file

@ -4,7 +4,7 @@
let
cfg = config.raspberry-pi-nix;
board = cfg.board;
version = cfg.kernel_version;
version = cfg.kernel-version;
kernel = pkgs.rpi-kernels."${version}"."${board}";
in
{
@ -12,7 +12,7 @@ in
options = with lib; {
raspberry-pi-nix = {
kernel_version = mkOption {
kernel-version = mkOption {
default = "v6_6_31";
type = types.str;
description = ''
@ -115,7 +115,7 @@ in
TARGET_FIRMWARE_DIR="${firmware-path}"
TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
UBOOT="${pkgs.uboot_rpi_arm64}/u-boot.bin"
UBOOT="${pkgs.uboot-rpi-arm64}/u-boot.bin"
KERNEL="${kernel}/Image"
SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"}
SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
@ -133,7 +133,7 @@ in
cp "$UBOOT" "$TMPFILE"
mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
echo "${
builtins.toString pkgs.uboot_rpi_arm64
builtins.toString pkgs.uboot-rpi-arm64
}" > "$STATE_DIRECTORY/uboot-version"
rm "$STATE_DIRECTORY/uboot-migration-in-progress"
}
@ -194,7 +194,7 @@ in
}
if [[ "$SHOULD_UBOOT" -eq 1 ]] && [[ -f "$STATE_DIRECTORY/uboot-migration-in-progress" || ! -f "$STATE_DIRECTORY/uboot-version" || $(< "$STATE_DIRECTORY/uboot-version") != ${
builtins.toString pkgs.uboot_rpi_arm64
builtins.toString pkgs.uboot-rpi-arm64
} ]]; then
migrate_uboot
fi