diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-17 04:06:24 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-22 13:18:23 +0100 |
| commit | 30cc156c8c372076ca7d3c00e9da8aefcaea9e14 (patch) | |
| tree | cda16424464360be0b8a252a89f164fa51eaec78 /nixos/modules/services/hardware | |
| parent | cf1fb92b9e8f8e3644a4738bceeb09d46d36694e (diff) | |
| download | nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar.gz nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar.bz2 nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar.lz nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar.xz nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.tar.zst nixlib-30cc156c8c372076ca7d3c00e9da8aefcaea9e14.zip | |
nixos/fwupd: use manual list of etc files
Closes: #32142
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 1f4acd21eccf..d8abde2a600a 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,12 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - isRegular = v: v == "regular"; - listFiles = d: builtins.attrNames (filterAttrs (const isRegular) (builtins.readDir d)); - copiedDirs = [ "fwupd/remotes.d" "pki/fwupd" "pki/fwupd-metadata" ]; - originalFiles = concatMap (d: map (f: "${d}/${f}") (listFiles "${pkgs.fwupd}/etc/${d}")) copiedDirs; mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile originalFiles); + in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; |