From 4a6e3b245450b5221eba18bf81b66bb02e1cafb2 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <brinkmeier@meqo.de>
Date: Tue, 7 Oct 2025 10:28:30 +0200
Subject: [PATCH] Reformat image flake output

---
 flake.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7d585b3..2fc0314 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,22 +58,23 @@
             # Return only the bin folder to curb image size
             compose.justStaticExecutables
           ];
+
+        image =
+          pkgs.dockerTools.buildImage {
+            name = "git.pbrinkmeier.de/paul/yore";
+            tag = yore.version;
+            config.Cmd = [ "${yore}/bin/yore" ];
+          };
       in {
         packages = rec {
           default = yore;
-          inherit yore;
+          inherit yore image;
           yore-meta = pkgs.runCommand "yore-meta" {} ''
             mkdir -p $out
             echo -n ${yore.version} > $out/version
-            echo -n git.pbrinkmeier.de/paul/yore:${yore.version} > $out/image-tag
+            echo -n ${image.drvAttrs.imageName}:${image.drvAttrs.imageTag} > $out/image-tag
           '';
 
-          image =
-            pkgs.dockerTools.buildImage {
-              name = "git.pbrinkmeier.de/paul/yore";
-              tag = yore.version;
-              config.Cmd = [ "${yore}/bin/yore" ];
-            };
 
           opium_ = opium.packages.${system}.opium;
         };