dwarf-fortress: dfhack and TWBT fixes #95934
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
As of DFHack/dfhack@56e43a0, dfhack gets its goodies from the directory above the Dwarf_Fortress executable, which leads to stock Dwarf Fortress and not the built environment where all the dfhack resources are symlinked to (typically ~/.local/share/df_linux). This causes errors like `tweak is not a recognized command` to be reported and dfhack to lose some of its functionality.
dfhack expects an unversioned libruby.so to be present in the hack
subdirectory for ruby plugins to function. The glob is necessary,
because the ruby package's library names are formatted as
ruby-${version}.so for whatever reason. The glob makes it possible for
ruby to update without manual intervention being needed here.
The original mifki TWBT hasn't been updated since April 2019, while thurin's fork has added support for dfhack 0.47.04-r2. Thus, switch to thurin's fork when Dwarf Fortress 0.47.04 is used (and ever-so-slightly special case the url attribute).
cole-h
requested review from
jonringer and
srhb
and removed request for
jonringer
This was referenced Aug 21, 2020
|
i still play dwarf-fortress, and i did the last upstream bump :) EDIT: I just play vanilla with phoebus tileset. Never used dfhack |
jonringer
approved these changes
Aug 21, 2020
There was a problem hiding this comment.
diff LGTM
was able to load old fortress
https://github.com/NixOS/nixpkgs/pull/95934
10 packages built:
dwarf-fortress dwarf-fortress-packages.dwarf-fortress-full dwarf-fortress-packages.dwarf-fortress_0_43_05 dwarf-fortress-packages.dwarf-fortress_0_44_05 dwarf-fortress-packages.dwarf-fortress_0_44_09 dwarf-fortress-packages.dwarf-fortress_0_44_10 dwarf-fortress-packages.dwarf-fortress_0_44_11 dwarf-fortress-packages.dwarf-fortress_0_44_12 dwarf-fortress-packages.dwarf-fortress_0_47_01 dwarf-fortress-packages.dwarf-fortress_0_47_02
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
I recently got into Dwarf Fortress, and some things were not working as expected.
r2release, which is considerably newer than thealpha0release).Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Closes #88497 (superceded).
Resolves #56013 (dfhack doesn't load to a black screen for me; I've also resolved the dfhack + twbt compat issue).
Resolves #56485 (dfhack no longer complains about being unable to load the ruby library).
cc @srhb
EDIT: Sorry for the ping, Jon. Clicked on your name by mistake x)