summaryrefslogtreecommitdiffstats
path: root/util/liveiso
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2022-02-19 17:15:31 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-02-21 15:25:18 +0000
commit3a5e6f529c286f7f5da2659347c7d9177fb311cd (patch)
tree0bc0d2aa580236e905b422d0fa4286151b9cbce6 /util/liveiso
parent2164c308b45aa6d1e1e45e62b9cec7aeb2c9cb9d (diff)
downloadcoreboot-3a5e6f529c286f7f5da2659347c7d9177fb311cd.tar.gz
coreboot-3a5e6f529c286f7f5da2659347c7d9177fb311cd.tar.bz2
coreboot-3a5e6f529c286f7f5da2659347c7d9177fb311cd.zip
util/liveiso: Use programs.flashrom.enable
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 <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/62193 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'util/liveiso')
-rw-r--r--util/liveiso/common.nix5
-rw-r--r--util/liveiso/description.md2
2 files changed, 3 insertions, 4 deletions
diff --git a/util/liveiso/common.nix b/util/liveiso/common.nix
index fefbe8156b43..881c5b84e213 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 a9e2eb8b8740..b056a9f313af 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.