Commit Graph

27 Commits

Author SHA1 Message Date
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Kranium Gikos Mendoza
33638ca99e scummvm: fix build (#18051) 2016-08-28 07:54:22 +00:00
Robin Gloster
7ab971a252 scummvm: disable format hardening 2016-08-03 20:32:34 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tobias Geerinckx-Rice
d37fe91396
scummvm: 1.7.0 -> 1.8.0 2016-05-25 02:06:47 +02:00
Sebastian Korten
b42aa6830b scummvm: version bump to 1.7 2014-07-30 20:26:29 +02:00
Arvin Moezzi
58cbfedc5d scummvm: upgrade from 1.2.1 to 1.6.0 2014-06-12 09:30:39 +02:00
Florian Friesdorf
7186978ce9 scummvm more deps
svn path=/nixpkgs/trunk/; revision=29447
2011-09-23 02:23:05 +00:00
Eelco Dolstra
aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Armijn Hemel
3f7c7b4ad4 update to 1.2.1
svn path=/nixpkgs/trunk/; revision=25254
2010-12-23 13:20:32 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Armijn Hemel
b386628220 update to 1.2.0
svn path=/nixpkgs/trunk/; revision=24368
2010-10-19 15:30:12 +00:00
Lluís Batlle i Rossell
51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Armijn Hemel
049c896998 update to 1.1.1
svn path=/nixpkgs/trunk/; revision=21585
2010-05-03 23:14:28 +00:00
Armijn Hemel
d4e934b3d2 update to 1.1.0
svn path=/nixpkgs/trunk/; revision=21006
2010-04-10 21:06:23 +00:00
Armijn Hemel
01e8f02ce0 update to 1.0.0
svn path=/nixpkgs/trunk/; revision=19085
2009-12-23 20:39:21 +00:00
Armijn Hemel
7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Armijn Hemel
67cbb2c3fb update to 0.13.0
svn path=/nixpkgs/trunk/; revision=14288
2009-03-01 00:48:25 +00:00
Armijn Hemel
99fcd8c685 update to 0.12.0
svn path=/nixpkgs/trunk/; revision=12844
2008-09-11 21:29:44 +00:00
Armijn Hemel
70ac99975d update to 0.11.1
svn path=/nixpkgs/trunk/; revision=10925
2008-03-03 00:06:23 +00:00
Armijn Hemel
10daeadd7d update to 0.11
svn path=/nixpkgs/trunk/; revision=10526
2008-02-06 19:07:54 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Armijn Hemel
a40edab035 update to 0.10.0
svn path=/nixpkgs/trunk/; revision=8918
2007-06-25 22:48:45 +00:00
Eelco Dolstra
f2da0ba2c4 svn path=/nixpkgs/trunk/; revision=8653 2007-05-03 16:13:14 +00:00
Eelco Dolstra
a533c69b39 * Latest ScummVM.
svn path=/nixpkgs/trunk/; revision=8652
2007-05-03 15:24:13 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel
d9ec01e77f add scummvm (scummvm.sf.net)
svn path=/nixpkgs/trunk/; revision=6079
2006-08-08 23:39:03 +00:00