From 7a344fbb5e73701dff8fd15be6ede90d083d424e Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Fri, 21 Aug 2020 09:54:11 -0400
Subject: [PATCH] feat(nix/buildLisp): Expose an sbcl attribute

Expose an `sbcl` attribute on packages and programs, to allow for easier
development either with SLY or on a REPL.

Change-Id: Ide4d087a5223561e1fe192ef32dc593c54b5a20e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1834
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
---
 nix/buildLisp/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix
index 98d626087..9538f0852 100644
--- a/nix/buildLisp/default.nix
+++ b/nix/buildLisp/default.nix
@@ -159,7 +159,7 @@ let
           expression = tests.expression;
         }
         else null;
-    in runCommandNoCC "${name}-cllib" {
+    in lib.fix (self: runCommandNoCC "${name}-cllib" {
       LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
       LANG = "C.UTF-8";
     } ''
@@ -181,7 +181,8 @@ let
       lispName = name;
       lispBinary = false;
       tests = testDrv;
-    };
+      sbcl = sbclWith [ self ];
+    });
 
   # 'program' creates an executable containing a dumped image of the
   # specified sources and dependencies.
@@ -210,7 +211,7 @@ let
           expression = tests.expression;
         }
         else null;
-    in runCommandNoCC "${name}" {
+    in lib.fix (self: runCommandNoCC "${name}" {
       nativeBuildInputs = [ makeWrapper ];
       LD_LIBRARY_PATH = libPath;
       LANG = "C.UTF-8";
@@ -231,7 +232,8 @@ let
       lispNativeDeps = native;
       lispBinary = true;
       tests = testDrv;
-    };
+      sbcl = sbclWith [ self ];
+    });
 
   # 'bundled' creates a "library" that calls 'require' on a built-in
   # package, such as any of SBCL's sb-* packages.