New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dwarf-fortress: Fix themes & package Legends Browser #43043
Conversation
e86ed5a
to
2f918a4
Compare
@@ -17,15 +17,15 @@ let | |||
else theme; | |||
|
|||
# These are in inverse order for first packages to override the next ones. | |||
pkgs = lib.optional (theme != null) ptheme | |||
++ lib.optional enableDFHack dfhack_ | |||
themePkg = lib.optional (theme != null) ptheme; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you show what the error was? It may have been the compatible check? If so it may be we just need to add that attribute to the new themes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops that's not in the .json file but I think we can add it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it will be easier to just remove the compatibility check - it doesn't really make sense to have any way because we only support the latest version of dwarf fortress.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was the compatibility check. But most of the themes aren't updated to the newest DF version, and they work anyway -- generally the case, of course; the worst case scenario is usually one or two new items reverting to ascii.
Which is to say that I believe the version check does more harm than good in this case, and so there's no reason to maintain it. That is, unless you're offering to test every theme with every bump, in which case I'd be happy to do as you suggest.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah do you think it's worth it to check for everything else though? like dfhack, soundsense, etc? I'm thinking not and just make everyone use the latest version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having mismatched versions of dfhack and df would make the game crash unpredictably, so I'm inclined to say yes. There's no reason not to update them in lockstep, of course; this just provides a sanity check to make sure we do so.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm less sure about soundsense, but it does tend to update along with DF, so probably still yes. The reason I don't want to keep the test for the tilesets is that they don't update that predictably, and they by and large keep working anyway.
@GrahamcOfBorg eval |
Motivation for this change
Theme support was broken, throwing errors if used.
Legends-browser is useful, and a good addition to the pack.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)