From 883eb4371cd6a4dd18a3b733c69bb206f957703c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 21 Apr 2009 18:30:54 +0000 Subject: [PATCH] Fixed dosbox expression svn path=/nixpkgs/branches/stdenv-updates/; revision=15220 --- pkgs/misc/emulators/dosbox/default.nix | 13 +++++++++++++ pkgs/top-level/release.nix | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 84f59075d73..2a4c66c43b9 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { }; buildInputs = [SDL]; + + # Add missing includes in order to fix compilation with glibc 2.9 + patchPhase = '' + echo "#include " > 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 " > 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 + ''; meta = { homepage = http://www.dosbox.com/; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0294c4c223d..429a2408de0 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -98,6 +98,7 @@ in { docbook_xml_dtd_42 = all; docbook_xml_dtd_43 = all; docbook_xsl = all; + dosbox = linux; doxygen = linux; e2fsprogs = linux; emacs22 = all;