From 3a5e6f529c286f7f5da2659347c7d9177fb311cd Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 19 Feb 2022 17:15:31 +0100 Subject: [PATCH] util/liveiso: Use programs.flashrom.enable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NixOS 21.11 introduced the option `programs.flashrom.enable`. The option allows installing flashrom and hooking up its udev rules. Thus, set it to `true` and add the user `user` to the `flashrom` group allowing it to use the programmers. Change-Id: I017ddb4314702a5252dfc0d05cd1e4961043d23b Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/62193 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- util/liveiso/common.nix | 5 +++-- util/liveiso/description.md | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/util/liveiso/common.nix b/util/liveiso/common.nix index fefbe8156b..881c5b84e2 100644 --- a/util/liveiso/common.nix +++ b/util/liveiso/common.nix @@ -93,12 +93,14 @@ user = { isNormalUser = true; group = "user"; - extraGroups = [ "users" "wheel" "networkmanager" "uucp" ]; + extraGroups = [ "users" "wheel" "networkmanager" "uucp" "flashrom" ]; initialHashedPassword = ""; }; }; }; + programs.flashrom.enable = true; + environment.systemPackages = with pkgs; [ acpica-tools btrfs-progs @@ -116,7 +118,6 @@ efivar exfat f2fs-tools - flashrom fuse fuse3 fwts diff --git a/util/liveiso/description.md b/util/liveiso/description.md index a9e2eb8b87..b056a9f313 100644 --- a/util/liveiso/description.md +++ b/util/liveiso/description.md @@ -5,8 +5,6 @@ NixOS configuration files for testing purposes and for working on firmware. ## TODO -- Use programs.flashrom.enable (#128205) and add `user` to `flashrom` group. - Will be usable from the next NixOS release. - Generate customized bootloader configs; FILO is WIP - Add coreboot toolchain - Switch to `programs.neovim` when the module is fixed.