about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-08-08T16·02+0200
committersterni <sternenseemann@systemli.org>2021-08-10T14·31+0000
commit0298ec862e4b5af7f23cae58693d6abca534deaf (patch)
tree2bb80b058503589cde1cff0f87269ca11573b0f6
parentb43366ed5021ad67139953fba88d4aa8be5875c6 (diff)
fix(nix/buildLisp): remove misplaced `makeOverridable`s r/2716
`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 <mail@tazj.in>
-rw-r--r--nix/buildLisp/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix
index 3e503a96a256..3d0c36958f02 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;
 }