Improve ergonomics of clwrapper #65342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
July 24, 2019 09:35
The CCL package installs a symlink named "ccl" that points at the actual implementation executable: lx86cl64 (or lx86cl for 32 bit). When clwrapper is used with CCL as the backing implementation, this script fails to recognize the implementation. By resolving the symlink, we are able to recognize which implementation we're actually working with.
The only difference between these forms is the return value when "$NIX_LISP_SKIP_CODE" is the empty string. In the original formulation, the script would return a false exit status. In the new formulation, it will return a true exit status. Its useful to be able to source cl-wrapper.sh (to get the variables it establishes), and its a bit annoying that sourcing it with NIX_LISP_SKIP_CODE=1 results in a false exit status.
7c6f434c
approved these changes
Jul 24, 2019
|
@GrahamcOfBorg build lispPackages.iolib |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
lispPackages.clwrapperis a useful package for creating nix derivations that support a variety of lisp compilers. Instead of running the compiler directly (and thus depending on a specific one), you use thecommon-lisp.shscript to actually invoke the compiler. Neat! Unfortunately, not all functionality is exposed conveniently. For example, if you want to get your compiler to load a file, you need to jump through some hoops. Right now, the easiest way to do that is to sourcecl-wrapper.shand use the variables it sets.Over in https://github.com/bradleyjensen/ql2nix, I to source
cl-wrapper.shduring abuildPhase. Unfortunately,cl-wrapper.shalways returns a non-zero exit code whenNIX_LISP_SKIP_CODEis the empty string. So, I had to hack around it by tossing a|| trueinto mybuildPhase. This PR corrects that.This PR also makes clwrapper work with CCL. The
common-lisp.shscript passes in the path to thecclsymlink rather than the path to the actual executable binary. That causescl-wrapper.shto fail to recognize the implementation.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)