Commit graph

27 commits

Author SHA1 Message Date
Robert Scott 428e215313 dosbox: 0.74-2 -> 0.74-3
fixes CVE-2019-7165, CVE-2019-12594
2019-07-14 12:39:15 +01:00
Chris Rendle-Short 86b5fb78dd dosbox: add XDG icon
Add an XDG icon for dosbox. The official icon is in .ico format, which
is not compatible with the freedesktop.org spec, so graphicsmagick is
included as a build time dependency and used to convert it to a PNG.
2019-04-21 22:04:10 +10:00
Orivej Desh 65e0b5c725 dosbox: 0.74 -> 0.74-2 2018-11-11 02:42:33 +00:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Jan Malakhovski 1858e8909e tree-wide: fix either check-meta or meta attrs of all the packages I evaluate 2017-12-05 13:46:52 +01:00
Matthew Bauer fdf92b553d dosbox: add gpl2 license 2017-11-13 20:55:40 -06:00
Matthew Bauer 3e6040e3ec dosbox: add myself as maintainer 2017-11-13 18:08:19 -06:00
Matthew Bauer 010475bb8b dosbox: build on darwin
fixes dosbox issue on dariwn
2017-11-13 18:07:57 -06:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +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
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Michael Raskin 3db3355c83 dosbox: pass mesa explicitly (needed for glu.h) 2016-04-25 09:12:24 +02:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster 1c156b9b59 dosbox: turn off format hardening 2016-02-10 23:27:49 +00:00
Eelco Dolstra f878980c8b * Fix building Dosbox with GCC 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31796
2012-01-23 17:21:37 +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
Eelco Dolstra 514caa90d3 * Dosbox updated to 0.74.
svn path=/nixpkgs/trunk/; revision=22039
2010-05-28 09:35:49 +00:00
Sander van der Burg ec871e6400 Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now
svn path=/nixpkgs/trunk/; revision=15786
2009-05-29 12:14:56 +00:00
Sander van der Burg c0605f9d3c Added desktop item to DOSBox
svn path=/nixpkgs/trunk/; revision=15599
2009-05-14 11:17:41 +00:00
Sander van der Burg 883eb4371c Fixed dosbox expression
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
2009-04-21 18:30:54 +00:00
Eelco Dolstra 808f12e369 * Dosbox 0.72.
svn path=/nixpkgs/trunk/; revision=14556
2009-03-16 12:22:47 +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
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +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 9c4f2df76b bugfix version
svn path=/nixpkgs/trunk/; revision=5664
2006-07-08 10:45:08 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra b13100fbdc * Added Dosbox, a DOS (x86) emulator.
svn path=/nixpkgs/trunk/; revision=4331
2005-12-03 02:32:02 +00:00