nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-09 12:06:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: format treewide

Browse source
This commit is contained in:
Jacob Birkett 2025-02-08 03:10:18 -08:00
parent 150128c843
commit 2abf8951ef
No known key found for this signature in database
GPG key ID: A65814ADB0C06288
8 changed files with 493 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

41
flake.nix
View file

@ -37,7 +37,8 @@
}; };
libcamera-src = { libcamera-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906 url =
"github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906
}; };
libpisp-src = { libpisp-src = {
flake = false; flake = false;
@ -51,11 +52,11 @@
system = "aarch64-linux"; system = "aarch64-linux";
overlays = with self.overlays; [ core libcamera ]; overlays = with self.overlays; [ core libcamera ];
}; };
in in {
{
overlays = { overlays = {
core = import ./overlays (builtins.removeAttrs srcs [ "self" ]); core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]); libcamera = import ./overlays/libcamera.nix
(builtins.removeAttrs srcs [ "self" ]);
}; };
nixosModules = { nixosModules = {
raspberry-pi = import ./rpi { raspberry-pi = import ./rpi {
@ -68,32 +69,34 @@
nixosConfigurations = { nixosConfigurations = {
rpi-example = srcs.nixpkgs.lib.nixosSystem { rpi-example = srcs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ self.nixosModules.raspberry-pi self.nixosModules.sd-image ./example ]; modules = [
self.nixosModules.raspberry-pi
self.nixosModules.sd-image
./example
];
}; };
}; };
checks.aarch64-linux = self.packages.aarch64-linux; checks.aarch64-linux = self.packages.aarch64-linux;
packages.aarch64-linux = with pinned.lib; packages.aarch64-linux = with pinned.lib;
let let
kernels = kernels = foldlAttrs f { } pinned.rpi-kernels;
foldlAttrs f { } pinned.rpi-kernels;
f = acc: kernel-version: board-attr-set: f = acc: kernel-version: board-attr-set:
foldlAttrs foldlAttrs (acc: board-version: drv:
(acc: board-version: drv: acc // { acc // {
"linux-${kernel-version}-${board-version}" = drv; "linux-${kernel-version}-${board-version}" = drv;
}) }) acc board-attr-set;
acc in {
board-attr-set; example-sd-image =
in self.nixosConfigurations.rpi-example.config.system.build.sdImage;
{
example-sd-image = self.nixosConfigurations.rpi-example.config.system.build.sdImage;
firmware = pinned.raspberrypifw; firmware = pinned.raspberrypifw;
libcamera = pinned.libcamera; libcamera = pinned.libcamera;
wireless-firmware = pinned.raspberrypiWirelessFirmware; wireless-firmware = pinned.raspberrypiWirelessFirmware;
uboot-rpi-arm64 = pinned.uboot-rpi-arm64; uboot-rpi-arm64 = pinned.uboot-rpi-arm64;
} // kernels; } // kernels;
formatter = formatter = srcs.nixpkgs.lib.genAttrs [
srcs.nixpkgs.lib.genAttrs "aarch64-linux"
[ "aarch64-linux" "aarch64-darwin" "x86_64-linux"] "aarch64-darwin"
(system: srcs.nixpkgs.legacyPackages.${system}.nixfmt-classic); "x86_64-linux"
] (system: srcs.nixpkgs.legacyPackages.${system}.nixfmt-classic);
}; };
} }

55
overlays/default.nix
View file

@ -1,12 +1,5 @@
{ u-boot-src { u-boot-src, rpi-linux-stable-src, rpi-linux-6_6_67-src, rpi-linux-6_12_11-src
, rpi-linux-stable-src , rpi-firmware-src, rpi-firmware-nonfree-src, rpi-bluez-firmware-src, ... }:
, rpi-linux-6_6_67-src
, rpi-linux-6_12_11-src
, rpi-firmware-src
, rpi-firmware-nonfree-src
, rpi-bluez-firmware-src
, ...
}:
final: prev: final: prev:
let let
versions = { versions = {
@ -14,15 +7,14 @@ let
v6_6_67.src = rpi-linux-6_6_67-src; v6_6_67.src = rpi-linux-6_6_67-src;
v6_12_11 = { v6_12_11 = {
src = rpi-linux-6_12_11-src; src = rpi-linux-6_12_11-src;
patches = [ patches = [{
{
name = "remove-readme-target.patch"; name = "remove-readme-target.patch";
patch = final.fetchpatch { patch = final.fetchpatch {
url = "https://github.com/raspberrypi/linux/commit/3c0fd51d184f1748b83d28e1113265425c19bcb5.patch"; url =
"https://github.com/raspberrypi/linux/commit/3c0fd51d184f1748b83d28e1113265425c19bcb5.patch";
hash = "sha256-v7uZOmPCUp2i7NGVgjqnQYe6dEBD+aATuP/oRs9jfuk="; hash = "sha256-v7uZOmPCUp2i7NGVgjqnQYe6dEBD+aATuP/oRs9jfuk=";
}; };
} }];
];
}; };
}; };
boards = [ "bcm2711" "bcm2712" ]; boards = [ "bcm2711" "bcm2712" ];
@ -32,8 +24,7 @@ let
let let
kernel = builtins.getAttr version versions; kernel = builtins.getAttr version versions;
version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version; version-slug = builtins.replaceStrings [ "v" "_" ] [ "" "." ] version;
in in {
{
"${version}"."${board}" = (final.buildLinux { "${version}"."${board}" = (final.buildLinux {
modDirVersion = version-slug; modDirVersion = version-slug;
version = version-slug; version = version-slug;
@ -61,10 +52,8 @@ let
KUNIT = no; KUNIT = no;
}; };
features.efiBootStub = false; features.efiBootStub = false;
kernelPatches = kernelPatches = if kernel ? "patches" then kernel.patches else [ ];
if kernel ? "patches" then kernel.patches else [ ]; }).overrideAttrs (oldAttrs: {
}).overrideAttrs
(oldAttrs: {
postConfigure = '' postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion. # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
@ -72,11 +61,9 @@ let
''; '';
}); });
}; };
rpi-kernels = builtins.foldl' rpi-kernels =
(b: a: final.lib.recursiveUpdate b (rpi-kernel a)) builtins.foldl' (b: a: final.lib.recursiveUpdate b (rpi-kernel a)) { };
{ }; in {
in
{
# disable firmware compression so that brcm firmware can be found at # disable firmware compression so that brcm firmware can be found at
# the path expected by raspberry pi firmware/device tree # the path expected by raspberry pi firmware/device tree
compressFirmwareXz = x: x; compressFirmwareXz = x: x;
@ -105,22 +92,20 @@ in
# default to latest firmware # default to latest firmware
raspberrypiWirelessFirmware = final.callPackage raspberrypiWirelessFirmware = final.callPackage
( (import ./raspberrypi-wireless-firmware.nix {
import ./raspberrypi-wireless-firmware.nix {
bluez-firmware = rpi-bluez-firmware-src; bluez-firmware = rpi-bluez-firmware-src;
firmware-nonfree = rpi-firmware-nonfree-src; firmware-nonfree = rpi-firmware-nonfree-src;
} }) { };
) raspberrypifw =
{ }; prev.raspberrypifw.overrideAttrs (oldfw: { src = rpi-firmware-src; });
raspberrypifw = prev.raspberrypifw.overrideAttrs (oldfw: { src = rpi-firmware-src; });
} // { } // {
# rpi kernels and firmware are available at # rpi kernels and firmware are available at
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'. # `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
# #
# For example: `pkgs.rpi-kernels.v6_6_67.bcm2712' # For example: `pkgs.rpi-kernels.v6_6_67.bcm2712'
rpi-kernels = rpi-kernels ( rpi-kernels = rpi-kernels (final.lib.cartesianProduct {
final.lib.cartesianProduct board = boards;
{ board = boards; version = (builtins.attrNames versions); } version = (builtins.attrNames versions);
); });
} }

14
overlays/libcamera.nix
View file

@ -1,8 +1,4 @@
{ rpicam-apps-src { rpicam-apps-src, libcamera-src, libpisp-src, ... }:
, libcamera-src
, libpisp-src
, ...
}:
final: prev: { final: prev: {
# A recent known working version of rpicam-apps # A recent known working version of rpicam-apps
libcamera-apps = libcamera-apps =
@ -27,12 +23,8 @@ final: prev: {
libpisp libpisp
openssl openssl
libtiff libtiff
(python3.withPackages (ps: with ps; [ (python3.withPackages
python3-gnutls (ps: with ps; [ python3-gnutls pybind11 pyyaml ply ]))
pybind11
pyyaml
ply
]))
libglibutil libglibutil
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
]); ]);

15
overlays/rpicam-apps.nix
View file

@ -1,4 +1,4 @@
{ rpicam-apps-src, lib, pkgs, stdenv }: { rpicam-apps-src, lib, pkgs, stdenv, }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "libcamera-apps"; pname = "libcamera-apps";
@ -7,7 +7,18 @@ stdenv.mkDerivation {
src = rpicam-apps-src; src = rpicam-apps-src;
nativeBuildInputs = with pkgs; [ meson pkg-config ]; nativeBuildInputs = with pkgs; [ meson pkg-config ];
buildInputs = with pkgs; [ libjpeg libtiff libcamera libepoxy boost libexif libpng ffmpeg libdrm ninja ]; buildInputs = with pkgs; [
libjpeg
libtiff
libcamera
libepoxy
boost
libexif
libpng
ffmpeg
libdrm
ninja
];
mesonFlags = [ mesonFlags = [
"-Denable_qt=disabled" "-Denable_qt=disabled"
"-Denable_opencv=disabled" "-Denable_opencv=disabled"

32
rpi/config.nix
View file

@ -1,8 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
let let
cfg = config.hardware.raspberry-pi; cfg = config.hardware.raspberry-pi;
render-raspberrypi-config = render-raspberrypi-config = let
let
render-options = opts: render-options = opts:
lib.strings.concatStringsSep "\n" (render-dt-kvs opts); lib.strings.concatStringsSep "\n" (render-dt-kvs opts);
render-dt-param = x: "dtparam=" + x; render-dt-param = x: "dtparam=" + x;
@ -23,35 +22,29 @@ let
(render-dt-kvs params); (render-dt-kvs params);
render-dt-overlays = overlays: render-dt-overlays = overlays:
lib.strings.concatMapStringsSep "\n" render-dt-overlay lib.strings.concatMapStringsSep "\n" render-dt-overlay
(lib.attrsets.mapAttrsToList (lib.attrsets.mapAttrsToList (k: v: {
(k: v: {
overlay = k; overlay = k;
args = render-dt-kvs v.params; args = render-dt-kvs v.params;
}) }) (lib.filterAttrs (k: v: v.enable) overlays));
(lib.filterAttrs (k: v: v.enable) overlays));
render-config-section = k: render-config-section = k:
{ options, base-dt-params, dt-overlays }: { options, base-dt-params, dt-overlays, }:
let let
all-config = lib.concatStringsSep "\n" (lib.filter (x: x != "") [ all-config = lib.concatStringsSep "\n" (lib.filter (x: x != "") [
(render-options options) (render-options options)
(render-base-dt-params base-dt-params) (render-base-dt-params base-dt-params)
(render-dt-overlays dt-overlays) (render-dt-overlays dt-overlays)
]); ]);
in in ''
''
[${k}] [${k}]
${all-config} ${all-config}
''; '';
in in conf:
conf:
lib.strings.concatStringsSep "\n" lib.strings.concatStringsSep "\n"
(lib.attrsets.mapAttrsToList render-config-section conf); (lib.attrsets.mapAttrsToList render-config-section conf);
in in {
{
options = { options = {
hardware.raspberry-pi = { hardware.raspberry-pi = {
config = config = let
let
rpi-config-param = { rpi-config-param = {
options = { options = {
enable = lib.mkEnableOption "attr"; enable = lib.mkEnableOption "attr";
@ -115,14 +108,14 @@ in
}; };
}; };
}; };
in in lib.mkOption {
lib.mkOption {
type = with lib.types; attrsOf (submodule raspberry-pi-config-options); type = with lib.types; attrsOf (submodule raspberry-pi-config-options);
}; };
config-generated = lib.mkOption { config-generated = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = "the config text generated by raspberrypi.hardware.config"; description =
"the config text generated by raspberrypi.hardware.config";
readOnly = true; readOnly = true;
}; };
@ -139,6 +132,7 @@ in
}; };
}; };
config = { config = {
hardware.raspberry-pi.config-generated = render-raspberrypi-config cfg.config; hardware.raspberry-pi.config-generated =
render-raspberrypi-config cfg.config;
}; };
} }

69
rpi/default.nix
View file

@ -1,4 +1,4 @@
{ pinned, core-overlay, libcamera-overlay }: { pinned, core-overlay, libcamera-overlay, }:
{ lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
let let
@ -6,9 +6,9 @@ let
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board; board = cfg.board;
kernel = config.system.build.kernel; kernel = config.system.build.kernel;
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; initrd =
in "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
{ in {
imports = [ ./config.nix ./i2c.nix ]; imports = [ ./config.nix ./i2c.nix ];
options = with lib; { options = with lib; {
@ -82,12 +82,13 @@ in
config = { config = {
systemd.services = { systemd.services = {
"raspberry-pi-firmware-migrate" = "raspberry-pi-firmware-migrate" = {
{
description = "update the firmware partition"; description = "update the firmware partition";
wantedBy = if cfg.firmware-migration-service.enable then [ "multi-user.target" ] else [ ]; wantedBy = if cfg.firmware-migration-service.enable then
serviceConfig = [ "multi-user.target" ]
let else
[ ];
serviceConfig = let
firmware-path = "/boot/firmware"; firmware-path = "/boot/firmware";
kernel-params = pkgs.writeTextFile { kernel-params = pkgs.writeTextFile {
name = "cmdline.txt"; name = "cmdline.txt";
@ -95,8 +96,7 @@ in
${lib.strings.concatStringsSep " " config.boot.kernelParams} ${lib.strings.concatStringsSep " " config.boot.kernelParams}
''; '';
}; };
in in {
{
Type = "oneshot"; Type = "oneshot";
MountImages = MountImages =
"/dev/disk/by-label/${cfg.firmware-partition-label}:${firmware-path}"; "/dev/disk/by-label/${cfg.firmware-partition-label}:${firmware-path}";
@ -126,7 +126,9 @@ in
touch "$STATE_DIRECTORY/uboot-migration-in-progress" touch "$STATE_DIRECTORY/uboot-migration-in-progress"
cp "$UBOOT" "$TMPFILE" cp "$UBOOT" "$TMPFILE"
mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin" mv -T "$TMPFILE" "$TARGET_FIRMWARE_DIR/u-boot-rpi-arm64.bin"
echo "${builtins.toString cfg.uboot.package}" > "$STATE_DIRECTORY/uboot-version" echo "${
builtins.toString cfg.uboot.package
}" > "$STATE_DIRECTORY/uboot-version"
rm "$STATE_DIRECTORY/uboot-migration-in-progress" rm "$STATE_DIRECTORY/uboot-migration-in-progress"
} }
''} ''}
@ -249,7 +251,8 @@ in
# linux kernel. # linux kernel.
kernel = { kernel = {
enable = true; enable = true;
value = if cfg.uboot.enable then "u-boot-rpi-arm64.bin" else "kernel.img"; value =
if cfg.uboot.enable then "u-boot-rpi-arm64.bin" else "kernel.img";
}; };
ramfsfile = { ramfsfile = {
enable = !cfg.uboot.enable; enable = !cfg.uboot.enable;
@ -294,11 +297,12 @@ in
}; };
nixpkgs = { nixpkgs = {
overlays = overlays = let
let
rpi-overlays = [ core-overlay ] rpi-overlays = [ core-overlay ]
++ (if config.raspberry-pi-nix.libcamera-overlay.enable ++ (if config.raspberry-pi-nix.libcamera-overlay.enable then
then [ libcamera-overlay ] else [ ]); [ libcamera-overlay ]
else
[ ]);
rpi-overlay = lib.composeManyExtensions rpi-overlays; rpi-overlay = lib.composeManyExtensions rpi-overlays;
pin-prev-overlay = overlay: pinned-prev: final: prev: pin-prev-overlay = overlay: pinned-prev: final: prev:
let let
@ -308,17 +312,18 @@ in
lib.fix (final: pinned-prev // overlay final pinned-prev); lib.fix (final: pinned-prev // overlay final pinned-prev);
# We only want to set keys that appear in the overlay, so restrict applied-overlay to # We only want to set keys that appear in the overlay, so restrict applied-overlay to
# these keys # these keys
restricted-overlay = lib.getAttrs (builtins.attrNames (overlay { } { })) applied-overlay; restricted-overlay =
in lib.getAttrs (builtins.attrNames (overlay { } { }))
prev // restricted-overlay; applied-overlay;
in in prev // restricted-overlay;
if cfg.pin-inputs.enable in if cfg.pin-inputs.enable then
then [ (pin-prev-overlay rpi-overlay pinned) ] [ (pin-prev-overlay rpi-overlay pinned) ]
else [ rpi-overlay ]; else
[ rpi-overlay ];
}; };
boot = { boot = {
kernelParams = kernelParams = if cfg.uboot.enable then
if cfg.uboot.enable then [ ] [ ]
else [ else [
"console=tty1" "console=tty1"
# https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108 # https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108
@ -334,7 +339,8 @@ in
"reset-raspberrypi" # required for vl805 firmware to load "reset-raspberrypi" # required for vl805 firmware to load
]; ];
}; };
kernelPackages = pkgs.linuxPackagesFor pkgs.rpi-kernels."${version}"."${board}"; kernelPackages =
pkgs.linuxPackagesFor pkgs.rpi-kernels."${version}"."${board}";
loader = { loader = {
grub.enable = lib.mkDefault false; grub.enable = lib.mkDefault false;
initScript.enable = !cfg.uboot.enable; initScript.enable = !cfg.uboot.enable;
@ -348,11 +354,12 @@ in
}; };
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
users.groups = builtins.listToAttrs (map (k: { name = k; value = { }; }) users.groups = builtins.listToAttrs (map (k: {
[ "input" "sudo" "plugdev" "games" "netdev" "gpio" "i2c" "spi" ]); name = k;
value = { };
}) [ "input" "sudo" "plugdev" "games" "netdev" "gpio" "i2c" "spi" ]);
services = { services = {
udev.extraRules = udev.extraRules = let shell = "${pkgs.bash}/bin/bash";
let shell = "${pkgs.bash}/bin/bash";
in '' in ''
# https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules # https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
SUBSYSTEM=="input", GROUP="input", MODE="0660" SUBSYSTEM=="input", GROUP="input", MODE="0660"

30
sd-image/default.nix
View file

@ -13,14 +13,15 @@
# table, so the partition table id is a 1-indexed hex # table, so the partition table id is a 1-indexed hex
# number. So, we drop the hex prefix and stick on a "02" to # number. So, we drop the hex prefix and stick on a "02" to
# refer to the root partition. # refer to the root partition.
"root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02" "root=PARTUUID=${
lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID
}-02"
"rootfstype=ext4" "rootfstype=ext4"
"fsck.repair=yes" "fsck.repair=yes"
"rootwait" "rootwait"
]; ];
sdImage = sdImage = let
let
kernel-params = pkgs.writeTextFile { kernel-params = pkgs.writeTextFile {
name = "cmdline.txt"; name = "cmdline.txt";
text = '' text = ''
@ -30,32 +31,27 @@
cfg = config.raspberry-pi-nix; cfg = config.raspberry-pi-nix;
version = cfg.kernel-version; version = cfg.kernel-version;
board = cfg.board; board = cfg.board;
kernel = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}"; kernel =
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
populate-kernel = initrd =
if cfg.uboot.enable "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
then '' populate-kernel = if cfg.uboot.enable then ''
cp ${cfg.uboot.package}/u-boot.bin firmware/u-boot-rpi-arm64.bin cp ${cfg.uboot.package}/u-boot.bin firmware/u-boot-rpi-arm64.bin
'' '' else ''
else ''
cp "${kernel}" firmware/kernel.img cp "${kernel}" firmware/kernel.img
cp "${initrd}" firmware/initrd cp "${initrd}" firmware/initrd
cp "${kernel-params}" firmware/cmdline.txt cp "${kernel-params}" firmware/cmdline.txt
''; '';
in in {
{
populateFirmwareCommands = '' populateFirmwareCommands = ''
${populate-kernel} ${populate-kernel}
cp -r ${pkgs.raspberrypifw}/share/raspberrypi/boot/{start*.elf,*.dtb,bootcode.bin,fixup*.dat,overlays} firmware cp -r ${pkgs.raspberrypifw}/share/raspberrypi/boot/{start*.elf,*.dtb,bootcode.bin,fixup*.dat,overlays} firmware
cp ${config.hardware.raspberry-pi.config-output} firmware/config.txt cp ${config.hardware.raspberry-pi.config-output} firmware/config.txt
''; '';
populateRootCommands = populateRootCommands = if cfg.uboot.enable then ''
if cfg.uboot.enable
then ''
mkdir -p ./files/boot mkdir -p ./files/boot
${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
'' '' else ''
else ''
mkdir -p ./files/sbin mkdir -p ./files/sbin
content="$( content="$(
echo "#!${pkgs.bash}/bin/bash" echo "#!${pkgs.bash}/bin/bash"

13
sd-image/sd-image.nix
View file

@ -30,8 +30,7 @@ let
} // optionalAttrs (config.sdImage.rootPartitionUUID != null) { } // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
uuid = config.sdImage.rootPartitionUUID; uuid = config.sdImage.rootPartitionUUID;
}); });
in in {
{
imports = [ ]; imports = [ ];
options.sdImage = { options.sdImage = {
@ -153,7 +152,8 @@ in
config = { config = {
fileSystems = { fileSystems = {
"/boot/firmware" = { "/boot/firmware" = {
device = "/dev/disk/by-label/${config.raspberry-pi-nix.firmware-partition-label}"; device =
"/dev/disk/by-label/${config.raspberry-pi-nix.firmware-partition-label}";
fsType = "vfat"; fsType = "vfat";
}; };
"/" = { "/" = {
@ -164,8 +164,8 @@ in
sdImage.storePaths = [ config.system.build.toplevel ]; sdImage.storePaths = [ config.system.build.toplevel ];
system.build.sdImage = pkgs.callPackage system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs
({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, util-linux, zstd }: , mtools, libfaketime, util-linux, zstd, }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = config.sdImage.imageName; name = config.sdImage.imageName;
@ -237,8 +237,7 @@ in
zstd -T$NIX_BUILD_CORES --rm $img zstd -T$NIX_BUILD_CORES --rm $img
fi fi
''; '';
}) }) { };
{ };
boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot '' boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot ''
# On the first boot do some maintenance tasks # On the first boot do some maintenance tasks