From d29591d47d6de9c82539f18994a268f5215a4ee6 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 22 Jan 2024 23:07:30 -0800
Subject: [PATCH] group packages in attrset literal

This will make generating packages for cross possible.
---
 flake.nix | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index a86422c3..9d73ba9b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,25 +71,27 @@
       };
     in
     {
-      packages.default = package pkgsHost;
+      packages = {
+        default = package pkgsHost;
 
-      packages.oci-image =
-      let
-        package = self.packages.${system}.default;
-      in
-      pkgsHost.dockerTools.buildImage {
-        name = package.pname;
-        tag = "latest";
-        config = {
-          # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT) are
-          # handled as expected
-          Entrypoint = [
-            "${pkgsHost.lib.getExe' pkgsHost.tini "tini"}"
-            "--"
-          ];
-          Cmd = [
-            "${pkgsHost.lib.getExe package}"
-          ];
+        oci-image =
+        let
+          package = self.packages.${system}.default;
+        in
+        pkgsHost.dockerTools.buildImage {
+          name = package.pname;
+          tag = "latest";
+          config = {
+            # Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT)
+            # are handled as expected
+            Entrypoint = [
+              "${pkgsHost.lib.getExe' pkgsHost.tini "tini"}"
+              "--"
+            ];
+            Cmd = [
+              "${pkgsHost.lib.getExe package}"
+            ];
+          };
         };
       };