mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nix/buildLisp): Expose an sbcl attribute

Browse source 
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>
This commit is contained in:
Griffin Smith 2020-08-21 09:54:11 -04:00 committed by glittershark
parent d4824b64f6
commit 7a344fbb5e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nix/buildLisp/default.nix
View file

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