add tint, nvramcui, coreinfo

1 files changed, 32 insertions, 25 deletions

diff --git a/flake.nix b/flake.nix
index 2c7599cee0c7..b235fa9ef5c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,33 +7,40 @@
   };
 
   description = "A collections of derivations for coreboot and payloads";
-  outputs = { self, nixpkgs }: {
-    packages.x86_64-linux = let
-      nixpkgsOptions = {
-        system = "x86_64-linux";
-        overlays = [
-          (import ./pkgs/overlay.nix)
-        ];
-      };
-      pkgs = import nixpkgs nixpkgsOptions;
-      inherit (pkgs) lib;
+  outputs = { self, nixpkgs }: let
+    nixpkgsOptions = {
+      system = "x86_64-linux";
+      overlays = [
+        (import ./pkgs/overlay.nix)
+      ];
+    };
+    pkgs = import nixpkgs nixpkgsOptions;
+    inherit (pkgs) lib;
 
-      makeDevice = configFile:
-        with lib.evalModules {
-          modules = [
-            ({ ... }: {
-              nixpkgs = nixpkgsOptions;
-            })
-            ("${nixpkgs}/nixos/modules/misc/assertions.nix")
-            ("${nixpkgs}/nixos/modules/misc/nixpkgs.nix")
-            ./modules
-            configFile
-          ];
-        };
-      config.corenix.rom;
-    in {
-      inherit (pkgs) coreboot-payload-grub2 coreboot-payload-tianocore coreboot;
+    makeDevice = configFile: (lib.evalModules {
+      modules = [
+        ({ ... }: {
+          nixpkgs = nixpkgsOptions;
+        })
+        ("${nixpkgs}/nixos/modules/misc/assertions.nix")
+        ("${nixpkgs}/nixos/modules/misc/nixpkgs.nix")
+        ./modules
+        configFile
+      ];
+    }).config.corenix.rom;
+  in {
+    lib = {
       inherit makeDevice;
+    };
+
+    packages.x86_64-linux = {
+      inherit (pkgs)
+      coreboot
+      coreboot-payload-grub2
+      coreboot-payload-tianocore
+      coreboot-payload-tint
+      coreboot-payload-nvramcui
+      coreboot-payload-coreinfo;
 
       milan-x1c = makeDevice ./configs/milan-x1c.nix;
       milan-x230t = makeDevice ./configs/milan-x230t.nix;