diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
| commit | ad1d58c6227abf2a9c80311eb09166a532384ed2 (patch) | |
| tree | 852498ff298f9b01c0d2c8b4c883da1a00912260 /nixos/modules/services/hardware | |
| parent | ebe4fd146b29c92fb59f243f75e46afc9f1a9048 (diff) | |
| parent | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (diff) | |
| download | nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.gz nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.bz2 nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.lz nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.xz nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.zst nixlib-ad1d58c6227abf2a9c80311eb09166a532384ed2.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/fwupd.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index cad9fa20de0f..223adfee96e8 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -8,8 +8,8 @@ let cfg = config.services.fwupd; originalEtc = let - mkEtcFile = n: nameValuePair n { source = "${pkgs.fwupd}/etc/${n}"; }; - in listToAttrs (map mkEtcFile pkgs.fwupd.filesInstalledToEtc); + mkEtcFile = n: nameValuePair n { source = "${cfg.package}/etc/${n}"; }; + in listToAttrs (map mkEtcFile cfg.package.filesInstalledToEtc); extraTrustedKeys = let mkName = p: "pki/fwupd/${baseNameOf (toString p)}"; @@ -24,7 +24,7 @@ let "fwupd/remotes.d/fwupd-tests.conf" = { source = pkgs.runCommand "fwupd-tests-enabled.conf" {} '' sed "s,^Enabled=false,Enabled=true," \ - "${pkgs.fwupd.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out" + "${cfg.package.installedTests}/etc/fwupd/remotes.d/fwupd-tests.conf" > "$out" ''; }; } else {}; @@ -77,13 +77,21 @@ in { <link xlink:href="https://github.com/hughsie/fwupd/blob/master/data/installed-tests/README.md">installed tests</link>. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.fwupd; + description = '' + Which fwupd package to use. + ''; + }; }; }; ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.fwupd ]; + environment.systemPackages = [ cfg.package ]; environment.etc = { "fwupd/daemon.conf" = { @@ -102,11 +110,11 @@ in { } // originalEtc // extraTrustedKeys // testRemote; - services.dbus.packages = [ pkgs.fwupd ]; + services.dbus.packages = [ cfg.package ]; - services.udev.packages = [ pkgs.fwupd ]; + services.udev.packages = [ cfg.package ]; - systemd.packages = [ pkgs.fwupd ]; + systemd.packages = [ cfg.package ]; systemd.tmpfiles.rules = [ "d /var/lib/fwupd 0755 root root -" |