diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-16 16:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 16:43:33 +0200 |
| commit | 7c20a53506da63b084f1a1e76735374f0cca4117 (patch) | |
| tree | 5e75876733842f0340e3d15d6e3638f329c1749a /nixos | |
| parent | 292cc4d235ed0d9b322c31aa2a029e422bce7720 (diff) | |
| parent | 0f0bcec11cb60288329a8f6313284cef29c8325e (diff) | |
| download | nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar.gz nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar.bz2 nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar.lz nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar.xz nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.tar.zst nixlib-7c20a53506da63b084f1a1e76735374f0cca4117.zip | |
Merge pull request #90539 from r-ryantm/auto-update/fwupd
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index e586af25c2b1..222ac8e487eb 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -6,6 +6,23 @@ with lib; let cfg = config.services.fwupd; + + customEtc = { + "fwupd/daemon.conf" = { + source = pkgs.writeText "daemon.conf" '' + [fwupd] + BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} + BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} + ''; + }; + "fwupd/uefi.conf" = { + source = pkgs.writeText "uefi.conf" '' + [uefi] + OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} + ''; + }; + }; + originalEtc = let mkEtcFile = n: nameValuePair n { source = "${cfg.package}/etc/${n}"; }; @@ -96,22 +113,8 @@ in { environment.systemPackages = [ cfg.package ]; - environment.etc = { - "fwupd/daemon.conf" = { - source = pkgs.writeText "daemon.conf" '' - [fwupd] - BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} - BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} - ''; - }; - "fwupd/uefi.conf" = { - source = pkgs.writeText "uefi.conf" '' - [uefi] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; - }; - - } // originalEtc // extraTrustedKeys // testRemote; + # customEtc overrides some files from the package + environment.etc = originalEtc // customEtc // extraTrustedKeys // testRemote; services.dbus.packages = [ cfg.package ]; |