I see, thanks. I'm not sure what's the right way to fix it for both though. Maybe @matthewbauer can help.

Btw you should target master and cherry-pick to release-20.09 branch after it's merged.

Edit: similar fix for uBoot builder - 03ae0c0

I see, thanks. I'm not sure what's the right way to fix it for both though. Maybe @matthewbauer can help.

It's probably something like what @flokli did in 54129e7
Sadly, I don't have the time atm. to look too deep into this one.

Btw you should target master and cherry-pick to release-20.09 branch after it's merged.

Right, thanks.

Sorry about this! This looks okay - it does mean you can't cross-compile a sd-image and use boot.loader.raspberryPi.enable, but this is the case for most of the boot.loader.* anyway. To cross-compile an sd-image, we'll have to do something like this:

{ pkgs, lib, config, modulesPath, ... }:

let
  raspberrypi-conf-builder =
    import (modulesPath + "/system/boot/loader/raspberrypi/raspberrypi-builder.nix") {
      pkgs = pkgs.buildPackages;
      raspberrypifw = pkgs.raspberrypifw;
      configTxt = pkgs.writeText "config.txt" (''
        kernel=kernel.img
        initramfs initrd followkernel
      '' + config.boot.loader.raspberryPi.firmwareConfig);
    };
in {
  imports = [ (modulesPath + "/installer/cd-dvd/sd-image.nix") ];

  sdImage.populateFirmwareCommands = "${raspberrypi-conf-builder} -c ${config.system.build.toplevel} -d firmware";
}

Thanks! I wonder if we should also revert 03ae0c0