craftos-pc: support for darwin#240092
Conversation
eec3010 to
9bc0c89
Compare
|
@tomodachi94 would you be able to help look into this? I'm not sure why craftos needs to build its own lua, could it not use Nixpkgs' lua? |
9bc0c89 to
fea8eb4
Compare
It could, but iirc ComputerCraft's Lua has some quirks that are not compatible with standard Lua. I'll take a closer look at this when I have more time, probably later tonight or tomorrow :) (Thanks for making this PR!) |
|
@siraben upon further inspection, CPC has a custom fork of liblua specifically for improved compatibility with the game itself. I don't think that replacing the custom patched Lua for a prebuilt one would work very well with the emulator. ( Also, if you rebase onto master, there should be some working tests that ensure this PR's changes work properly on all platforms. |
|
@siraben try rebasing your changes on top of |
fea8eb4 to
fac6260
Compare
tomodachi94
left a comment
There was a problem hiding this comment.
Lgtm, sorry for taking so long.
|
Can't merge ATM since it doesn't actually build on macOS yet. |
|
Hopefully this is easier once MCJack123/craftos2#373 is merged. |
fac6260 to
7838dc6
Compare
7838dc6 to
19b4fc9
Compare
tomodachi94
left a comment
There was a problem hiding this comment.
Diff mostly lgtm, just one smaller thing to avoid unnecessary repetition.
19b4fc9 to
de29ab5
Compare
|
@tomodachi94 let me know what you think |
tomodachi94
left a comment
There was a problem hiding this comment.
Diff lgtm. Thank you for putting in the effort to make this happen 💖
Description of changes
craftos-pc supports darwin as well as indicated in their project, however it requires a few adaptions.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)