Commit graph

35 commits

Author SHA1 Message Date
Artturin cd3ed54f6e dwarf-fortress: refactor 2021-06-30 00:10:57 -07:00
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Cole Helbling 5db4a65384 dfhack: 0.47.04-alpha0 -> 0.47.04-r2
As of
56e43a0dde,
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.
2020-08-21 14:45:53 -07:00
Matthew Piziak 879778c583 add enableSound parameter to dwarf-fortress derivation
try hardcoding

add back whitespace
2020-05-17 22:18:39 -04:00
Anders Kaseorg 3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
TrevtheForthDev 3fcd66cce8 Added EnableTextMode Dwarf Fortress for playing CLI 2019-05-08 04:07:21 +09:00
lassulus 0cd1e6732d dwarf-fortress: fix theme override 2018-11-08 01:59:56 +01:00
lassulus 290dd06d14 dwarf-fortress: fix most of customization options
see #49779
close #49803
2018-11-06 01:00:17 +01:00
lassulus 0d57159eca dwarf-fortress: fix build error 2018-10-08 22:21:09 +02:00
Morgan Jones fe847fcc92 Therapist needs to depend on the DF version, since it uses its MD5 2018-09-09 06:59:58 +00:00
Morgan Jones f14d3b4795 Fix dfhack's Dwarf Fortress MD5 in the correct environment 2018-09-09 06:59:41 +00:00
Morgan Jones 4ada74e293 dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions 2018-09-09 06:59:41 +00:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Matthew Bauer 3108f1eeaf Merge remote-tracking branch 'Baughn/nix-df' into dwarf-fortress 2018-07-09 16:24:21 -04:00
Matthew Bauer 530427c7ab dwarf-fortress: refactors
This will make it easier for people to access old versions.

You can now access attributes like:

- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
2018-07-09 16:13:52 -04:00
Svein Ove Aas b0c7245ee5 dwarf-fortress: Add "lazy pack", config flags and some comments. 2018-07-05 20:48:52 +01:00
Svein Ove Aas 5012ce727a dwarf-fortress: Init TWBT at 6.46 2018-07-05 20:21:59 +01:00
Matthew Bauer ea6b31b496
Merge pull request #43043 from Baughn/nix-df
dwarf-fortress: Fix themes & package Legends Browser
2018-07-04 17:41:06 -04:00
Svein Ove Aas 8c7461a348 dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them. 2018-07-04 20:19:24 +01:00
Matthew Bauer dcea211084 dwarf-fortress: cleanup 2018-07-02 11:59:36 -04:00
Morgan Jones 8d5b5fa68e Patch dwarf-fortress-unfuck to build in debug (pending upstream fix) 2018-07-01 20:28:59 +00:00
Morgan Jones 24f4711705 dwarf-fortress: 0.44.10 -> 0.44.11
Update everything but dfhack and dwarf-therapist, which
have not been updated yet.
2018-06-30 23:25:27 +00:00
Matthew Bauer 236b89afeb dwarf-fortress: supports darwin 2018-05-10 23:58:12 -05:00
Herwig Hochleitner d29cee773c dwarf-fortress: 0.43.05 -> 0.44.02
dwarf-therapist: 37.0.0-Hello71 -> 39.0.0
dfhack: 0.43.05-r1 -> 0.44.02-alpha1
cla-theme: 43.05-v23 -> 44.01-v24
phoebus-theme: 43.05c -> 44.02a

There is a new maintained repository for
dwarf-therapist: http://www.bay12forums.com/smf/index.php?topic=168411

dfhack is still in alpha, so make backups, if you use it.

cc @the-kenny @abbradar
2017-12-11 20:41:38 +01:00
Herwig Hochleitner 85056ee698 dwarf-fortress-packages.dfhack: add stoneSense support 2017-10-28 14:55:25 +02:00
Herwig Hochleitner 24ea093806 dwarf-fortress-packages.soundSense: init 2016-1_196 2017-10-28 14:55:20 +02:00
Nikolay Amiantov 714cf7803c dwarf-fortress.dfhack: enable 64-bit build, fix segfault 2016-11-24 03:10:43 +03:00
Nikolay Amiantov a6fd30822f dwarf-fortress-packages.dfhack: 0.43.03-r1 -> 0.43.05-alpha2 2016-11-24 01:17:56 +03:00
Nikolay Amiantov 99913c2820 dwarf-fortress-wrapper: make data/dipscript writable 2016-02-11 00:54:10 +03:00
Nikolay Amiantov f91f99aff8 dwarf-fortress: fix help 2016-02-07 15:55:06 +03:00
Nikolay Amiantov 82a0dde83c dwarf-fortress: remove short md5 sums 2016-01-26 03:06:57 +03:00
Nikolay Amiantov d3b642ce9a dwarf-fortress-wrapper: add themes support
Theme can be specified either as a derivation or as a string, in which
case it will be taken by name from a pre-defined set of themes available in
nixpkgs.
2016-01-26 03:06:07 +03:00
Nikolay Amiantov 92cda7a6bb dwarf-fortress: 0.40.24 -> 0.42.05, split derivations
This is a massive rework of the current dwarf_fortress package.
The main reason for rework is to split game, its libraries and wrappers,
enabling builds on Hydra and general maintainability.

dfhack, dwarf-fortress-unfuck, dwarf-fortress-original and dwarf-fortress
are now all separate derivations. All were updated to the latest versions
supporting DF 0.42.04 (some things taken from development branches):

dfhack: 20150927 -> 20160118
dwarf-fortress-unfuck: 0.40.24 -> 20160118
dwarf-fortress-original: 0.40.24 -> 0.42.05

dfhack got a patch for using more system libraries.

Wrapper scripts were also redone -- now they support DF_DIR variable (for
setting another data directory) and try to save more space by means of
symlinking. They now try to be more smart, updating those directories that were
not touched by user automatically.

All the new packages now reside in dwarf-fortress-packages. dwarf_fortress was
renamed into dwarf-fortress per our conventions, old name is deprecated. Also
duplicate dfhack derivation is removed.

Also drop dwarfFortress.enableDFHack config option; it can be re-added later
but now is deemed controversial.
2016-01-26 03:03:12 +03:00