Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now

svn path=/nixpkgs/trunk/; revision=15786
This commit is contained in:
Sander van der Burg 2009-05-29 12:14:56 +00:00
parent a39c2a0e88
commit ec871e6400

View File

@ -1,28 +1,15 @@
{stdenv, fetchurl, SDL, makeDesktopItem}: {stdenv, fetchurl, SDL, makeDesktopItem}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dosbox-0.72"; name = "dosbox-0.73";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/dosbox/${name}.tar.gz"; url = "mirror://sourceforge/dosbox/${name}.tar.gz";
sha256 = "0ydck7jgvdwnpxakg2y83dmk2dnwx146cgidbmdn7h75y7cxfiqp"; sha256 = "b0a94c46164391a9c32d9571e4d0b61ff238908ff0b77e09157c22dc98a93765";
}; };
buildInputs = [SDL]; buildInputs = [SDL];
# Add missing includes in order to fix compilation with glibc 2.9
patchPhase = ''
echo "#include <string.h>" > tmp.cpp
for i in src/hardware/gameblaster.cpp src/hardware/tandy_sound.cpp
do
cat tmp.cpp $i > $i.new
mv $i.new $i
done
echo "#include <stdlib.h>" > tmp.cpp
cat tmp.cpp src/shell/shell_cmds.cpp > src/shell/shell_cmds.cpp.new
mv src/shell/shell_cmds.cpp.new src/shell/shell_cmds.cpp
'';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "dosbox"; name = "dosbox";
exec = "dosbox"; exec = "dosbox";