From 42930c79ddf7a863f63f72a0c7bf089b6c3247e1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 27 Jan 2023 00:38:58 +0100
Subject: [PATCH] nixos/fwupd: Upgrade ESP path config key

This setting was renamed and moved to the main config file in fwupd 1.8.5:
https://github.com/fwupd/fwupd/commit/5d38e0aeea250ee2d4fdf347a7a8a90da4203356

Without this patch, fwupd tries to migrate the config and crashes when it meets the immutable:

    FuEngine             migrating OverrideESPMountPoint=/boot to EspLocation
    Failed to load daemon: failed to load engine: Failed to create file ?/etc/fwupd/daemon.conf.6HZBZ1?: Read-only file system

The setting was first introduced to the module in 08547ff642c91deb63d7aa1f26664a287694cbae to override the store paths set during build.https://github.com/fwupd/fwupd/commit/5d38e0aeea250ee2d4fdf347a7a8a90da4203356
---
 nixos/modules/services/hardware/fwupd.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 2431cb2a57c4..4e7d730d127b 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -121,6 +121,16 @@ in {
                 List of plugins to be disabled.
               '';
             };
+
+            EspLocation = mkOption {
+              type = types.path;
+              default = config.boot.loader.efi.efiSysMountPoint;
+              defaultText = lib.literalExpression "config.boot.loader.efi.efiSysMountPoint";
+              description = lib.mdDoc ''
+                The EFI system partition (ESP) path used if UDisks is not available
+                or if this partition is not mounted at /boot/efi, /boot, or /efi
+              '';
+            };
           };
         };
         default = {};