Commit graph

25 commits

Author SHA1 Message Date
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Moritz Ulrich 171bb614f2 Dwarf Fortress: Update to 0.40.24. 2015-01-26 00:00:31 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Vladimír Čunát 3dfd87d7af fixup "git-export" directory names
All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.

FIXME: it might be suitable to adapt nix-prefetch-git.
2015-01-13 17:46:09 +01:00
Moritz Ulrich f43d67d43a Dwarf Fortress: Update to 0.40.23. 2014-12-30 22:14:02 +01:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
Moritz Ulrich 54f3587549 dwarf-{fortress,therapist}: Update
DwarfTherapist does some ugly stuff by matching the first 8 characters
of the md5sum of the game binary to match its binary content. This patch
adds support to automatically patch the ini files.
2014-12-15 22:13:51 +01:00
Moritz Ulrich a175776477 dwarf-fortress: Update to 0.40.18. 2014-11-23 21:30:14 +01:00
Moritz Ulrich bc03398930 dwarf-fortress: Clean up expression & config file handling. 2014-11-23 21:30:14 +01:00
Moritz Ulrich 253c54e411 Dwarf Fortress: Update to 0.40.16. 2014-11-18 11:24:09 +01:00
Moritz Ulrich 35ea4085bc dwarf-fortress: delete old 34.11 package. 2014-11-07 17:22:29 +01:00
Moritz Ulrich 9c301c1fa1 dwarf-fortress: Update to 40.15. 2014-11-07 17:22:29 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Moritz Ulrich 7f7505c620 dwarf-fortress: Bump to 0.40.13. 2014-09-18 20:41:54 +02:00
Andrew Morsillo 8dbe652739 Bump DF version to 40_10 2014-08-28 21:12:05 -04:00
Andrew Morsillo de8a2e1433 Bump version of Dwarf Fortress to 40_09. Build graphics library for dwarf fortress instead of using provided one for more reliability. 2014-08-20 21:50:09 -04:00
Andrew Morsillo 911eb8d934 bump version to 0.40.05 2014-07-28 09:01:45 -04:00
Andrew Morsillo 7c84e3b785 Add dwarf fortress 2014 (unstable) version 2014-07-23 22:41:30 -04:00
Moritz Ulrich b98ae36d32 dwarf-fortress: Update to 0.34.11.
Somehow Dwarf Fortress suddenly started failing to use our libpng (or
zlib). I tried all possible combinations (supplying them via
LD_LIBRARY_PATH in the script) but it just won't work.

This solution was found in the Archlinux bug tracker: It just symlinks
all problematic .png files to their .bmp counterparts. It's ugly and
*sadly* breaks tileset support (unless you convert them to bmp) but I
think it's acceptable, as the whole expression is pretty problematic
in terms of purity.

Let's hope the next release of Dwarf Fortress will be easier to
support.

(fixes #710)
2013-10-10 01:21:55 +02:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal
svn path=/nixpkgs/trunk/; revision=33091
2012-03-14 22:44:41 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Russell O'Connor 7bb3f91731 updating dwarf-fortress
svn path=/nixpkgs/trunk/; revision=29853
2011-10-15 14:46:05 +00:00
Russell O'Connor 497a1476ae Dwarf Fortress files in dipscript are again opened in read-write mode and need to be hacked around.
It's almost tempting to copy the whole data dirctory and put every file in read-write mode.

svn path=/nixpkgs/trunk/; revision=24550
2010-10-31 04:08:14 +00:00
Russell O'Connor d32b86837b Dwarf Fortress help files are also opened in read-write mode, so they too need to be hacked around.
svn path=/nixpkgs/trunk/; revision=24543
2010-10-30 14:58:14 +00:00
Russell O'Connor cb72dd1ba8 Dwarf Fortress
The wrapper script works by creating an image of the distribution in the users home directory
(defaulting to $HOME/.config/df_linux).  This is done because the program expects to write
state into it's own distribution.

Better ideas are welcome!

What further is needed is to allow users to configure the init.  One way is to use nix-config
to apply patches to the init.txt file, though this would break sharing of the package between
different users.


svn path=/nixpkgs/trunk/; revision=24538
2010-10-30 06:00:44 +00:00