Commit graph

56 commits

Author SHA1 Message Date
Naïm Favier 34e0667b74
dwarf-fortress.dfhack: use CXXFLAGS instead of NIX_CFLAGS_COMPILE
See https://github.com/NixOS/nixpkgs/issues/79303.

Avoids warnings about -fpermissive not being a valid C flag.
2022-11-18 10:29:41 +01:00
Naïm Favier a515239b52
dwarf-fortress,dwarf-fortress.dfhack: add ncfavier as maintainer 2022-11-17 09:50:53 +01:00
Naïm Favier ab693c7592
dwarf-fortress.dfhack: drop broken versions
These versions don't build because their submodules use `git://` URLs,
which are no longer supported by GitHub.

I don't think there's a reasonable way to work around that since
`fetchgit` doesn't allow patching the source *before* fetching
submodules.
2022-11-17 09:50:53 +01:00
Naïm Favier e786b3ec21
dwarf-fortress.dfhack: updates and fixes
Updates the release number for the latest two DF versions, and fixes some
older ones.

Notable change from 0.47.05-r7: dfhack.init was moved into
dfhack-config/init.

https://github.com/DFHack/dfhack/releases/tag/0.47.05-r7

https://github.com/DFHack/dfhack/releases/tag/0.47.04-r5
2022-11-17 09:50:52 +01:00
Naïm Favier 839fdd101c
dwarf-fortress.dfhack: make overridable
Currently, it is quite hard to override anything about dfhack (for
example, to add plugins at build time), because

1. it is not exposed anywhere, so you have to do something like
   `dwarf-fortress.override (oldArgs: { dfhack = oldArgs.dfhack.override...; })`
2. the final `dfhack` derivation is a `buildEnv`, so `overrideAttrs`
   doesn't work as expected.

This fixes 1 by adding `dfhack` to the wrapper's `passthru`, and 2 by
moving `twbt.lib` (which is the only reason for the dfhack `buildEnv`)
into the wrapper.

Also adds an `extraPackages` argument to the wrapper, and copies `*.init`
files from the env to the DF directory so that we can easily add a
`dfhack.init`.

With these changes, I was able to build dfhack with the dfplex plugin.
2022-11-17 00:06:31 +01:00
Josef Kemetmüller bcd7045998 treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
2022-07-04 03:49:01 +03:00
Jonathan Ringer 075f25eb98 dwarf-fortress/dfhack: fix build with gcc 11 2022-04-30 11:00:41 -07:00
Jonathan Ringer a280713665 dwarf-fortress/dfhack: add 0.47.05-r1 2021-07-11 21:03:43 -07:00
Artturin cd3ed54f6e dwarf-fortress: refactor 2021-06-30 00:10:57 -07:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Cole Helbling 50bf68669a dfhack: fix ruby plugin
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.
2020-08-21 14:45:53 -07: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
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jonathan Ringer c9f216d5d5 dwarf-fortress: 0.47.02 -> 0.47.04 2020-03-13 14:46:55 -07:00
Jonathan Ringer 381e86a782 dwarf-fortress.dfhack: add 0.47.02-alpha0 release 2020-02-14 12:50:12 -08: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
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Morgan Jones 213b5457fc Inline JSON files 2018-09-09 07:15:59 +00:00
Morgan Jones 870f05c975 Fix dangling DFHack "Git:" version text 2018-09-09 06:59:58 +00:00
Morgan Jones 4ada74e293 dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions 2018-09-09 06:59:41 +00:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Herwig Hochleitner da9da8defd dwarf-fortess: make 0.44.12 the default version
all necessary support packages seem to have caught up

cc  @matthewbauer @Baughn @volth
2018-08-17 12:48:59 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Herwig Hochleitner 5c2ccd13a3 dwarf-fortress: re-include stonesense fix
This partially reverts commit dfc4744afd.

cc @matthewbauer
2018-07-14 14:24:35 +02:00
Svein Ove Aas 5012ce727a dwarf-fortress: Init TWBT at 6.46 2018-07-05 20:21:59 +01: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 9a2898c6d1 bump dwarf-therapist and dfhack versions; fix theme issue 2018-06-30 23:29:29 +00:00
Matthew Bauer 7170ab8433 dfhack: add SDL to buildInputs 2018-06-10 19:23:11 -04:00
Matthew Bauer 8f89f81b62 dfhack: add submodules 2018-06-10 19:23:11 -04:00
Matthew Bauer dfc4744afd dwarf-fortress: 44.09 → 44.10 2018-06-06 19:19:29 -04:00
Herwig Hochleitner 23aaf1cf97 dwarf-fortress: 0.44.05 -> 0.44.09 2018-04-21 14:57:44 +02:00
Nikolay Amiantov 2dfbef2764 dfhack: fix checksum
Fixes #36819.
2018-03-13 01:06:47 +03:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Nikolay Amiantov 00ad7c0c7b dwarf-fortress-packages.dfhack: 0.44.05-alpha1 -> 0.44.05-r2 2018-02-25 22:24:09 +03:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Herwig Hochleitner 8924e84daa dwarf-fortress: 0.44.03 -> 0.44.05 2018-01-22 02:16:47 +01:00
Herwig Hochleitner c36ebca240 dwarf-fortress: 0.44.02 -> 0.44.03 2017-12-30 14:52:50 +01: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
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Nikolay Amiantov 342b987b19 dwarf-fortress-packages.dfhack: 0.43.05-r1 -> 0.43.05-r2 2017-07-27 17:07:44 +03:00
Nick Hu 24156c64b4 dfhack: 0.43.05-alpha4 -> 0.43.05-r1 2017-06-26 10:18:55 +01:00
Nikolay Amiantov 1809cb56e1 dwarf-fortress-packages.dfhack: 0.43.05-alpha2 -> 0.43.05-alpha4 2017-01-31 03:27:10 +03: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 d0bee3aeec dwarf-fortress-packages.dfhack: 0.42.06-r1 -> 0.43.03-r1 2016-08-14 22:37:09 +03:00