From a78e6e88749aa794df4a44aeb2a6508976efdd72 Mon Sep 17 00:00:00 2001
From: David Arnold <david.arnold@iohk.io>
Date: Sat, 16 Sep 2023 01:30:30 +0200
Subject: [PATCH] fix: required input lazy on lib

---
 flake.nix                       |  6 +++++-
 src/lib/dev/mkMakes.nix         | 13 +++++--------
 src/std/errors/requireInput.nix |  7 +++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 77725da0..d7b4dcc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,5 +71,9 @@
     };
   in
     assert inputs.nixpkgs.lib.assertMsg ((builtins.compareVersions builtins.nixVersion "2.13") >= 0) "The truth is: you'll need a newer nix version to use Standard (minimum: v2.13).";
-      (import ./dogfood.nix (inputs // {inherit std;})) std;
+      (import ./dogfood.nix (inputs
+        // {
+          std = std // {inherit (inputs.self) narHash;};
+        }))
+      std;
 }
diff --git a/src/lib/dev/mkMakes.nix b/src/lib/dev/mkMakes.nix
index d1a98918..3334ec84 100644
--- a/src/lib/dev/mkMakes.nix
+++ b/src/lib/dev/mkMakes.nix
@@ -1,11 +1,10 @@
 let
   inherit (inputs.cells.std.errors) requireInput;
   inherit (requireInput "makes" "github:fluidattacks/makes" "std.lib.dev.mkMakes") nixpkgs makes;
-  inherit (nixpkgs) lib;
-
-  makes' = lib.fix (
-    lib.extends
-    (
+  inherit (inputs.nixpkgs.lib) customisation fix extends;
+in
+  customisation.callPackageWith (fix (
+    extends (
       _: _: {
         inherit inputs;
         inherit (nixpkgs) system;
@@ -17,6 +16,4 @@ let
       import (makes + /src/args/agnostic.nix) {inherit (nixpkgs) system;}
     )
     .__unfix__
-  );
-in
-  lib.customisation.callPackageWith makes'
+  ))
diff --git a/src/std/errors/requireInput.nix b/src/std/errors/requireInput.nix
index 1cabfa9a..e6652c15 100644
--- a/src/std/errors/requireInput.nix
+++ b/src/std/errors/requireInput.nix
@@ -29,8 +29,7 @@
   body = ''
     In order to use ${target}, add to {bold}flake.nix{un-bold}:
 
-      inputs.std.inputs.${input}.url =
-        "${url}";
+      inputs.std.inputs.${input}.url = "${url}";
   '';
 
   inputs' = let
@@ -63,7 +62,7 @@ in
       🏗️  │ {bold}Input Overloading for ${target}{un-bold}
     ─────┼─────────────────────────────────────────────────────────────────────────
       📝 │ {italic}${indent body}{un-italic}
+    ─────┼─────────────────────────────────────────────────────────────────────────
+      🙋 │ ${indent inputs'}
     ─────┴─────────────────────────────────────────────────────────────────────────
-      🙋   ${indent inputs'}
-    ───────────────────────────────────────────────────────────────────────────────
   ''); inputs