From f878980c8b78a639b3feabd1f8f9ed9f1b7c388c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 17:21:37 +0000 Subject: * Fix building Dosbox with GCC 4.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=31796 --- pkgs/misc/emulators/dosbox/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/misc/emulators/dosbox') diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index eff47c9c503b..2525cafc28b6 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -7,6 +7,16 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/dosbox/${name}.tar.gz"; sha256 = "01cfjc5bs08m4w79nbxyv7rnvzq2yckmgrbq36njn06lw8b4kxqk"; }; + + patches = + [ # Fix building with GCC 4.6. + (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch?revision=1.1"; + sha256 = "03iv1ph7fccfw327ngnhvzwyiix7fsbdb5mmpxivzkidhlrssxq9"; + }) + ]; + + patchFlags = "-p0"; buildInputs = [ SDL ]; -- cgit 1.4.1