about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-23 17:21:37 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-23 17:21:37 +0000
commitf878980c8b78a639b3feabd1f8f9ed9f1b7c388c (patch)
tree7c3033610d705989e3eb91a2e56b26c3fabcb8c1 /pkgs/misc
parent1e886749b5e3a8ad27ec4ddbebde47cd08183434 (diff)
* Fix building Dosbox with GCC 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31796
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/dosbox/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index eff47c9c503b8..2525cafc28b6d 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 ];