From 0298ec862e4b5af7f23cae58693d6abca534deaf Mon Sep 17 00:00:00 2001 From: sterni Date: Sun, 8 Aug 2021 18:02:33 +0200 Subject: fix(nix/buildLisp): remove misplaced `makeOverridable`s `makeOverriddable` doesn't work for bundled sbclWith as is because it uses the `//` operator internally which doesn't work with the types `bundled` and `sbclWith` accept as arguments (string and list respectively). What's more, `bundled` already uses `makeOverridable` and allows to override the internal call to `library` via `overrideLisp`. For `sbclWith` no such mechanism exists, but this seems to be no concern for now: Using `overrideLisp` for this hasn't worked so far (and failed with a _hideous_ evaluation error), so there doesn't seem to be any real demand for this feature. Maybe a feature for another CL. Change-Id: I0b2f34c00a2143cd66dd43a6b1b2880af997ee50 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3296 Tested-by: BuildkiteCI Reviewed-by: tazjin --- nix/buildLisp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nix/buildLisp') diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 3e503a96a2..3d0c36958f 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -256,6 +256,5 @@ let in { library = makeOverridable library; program = makeOverridable program; - sbclWith = makeOverridable sbclWith; - bundled = makeOverridable bundled; + inherit sbclWith bundled; } -- cgit 1.4.1