From ead553d9e55bfc22b4fe6574e43103f769dc3541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Feb 2010 08:08:29 +0000 Subject: [PATCH] Updating ddd, and adding a small patch for it to compile with gcc 4.4 svn path=/nixpkgs/trunk/; revision=20161 --- pkgs/development/tools/misc/ddd/default.nix | 6 ++++-- pkgs/development/tools/misc/ddd/gcc44.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/misc/ddd/gcc44.patch diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 62b94d34638e..0a6895aff6b9 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -1,13 +1,15 @@ {stdenv, fetchurl, lesstif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { - name = "ddd-3.3.11"; + name = "ddd-3.3.12"; src = fetchurl { url = "mirror://gnu/ddd/${name}.tar.gz"; - sha256 = "a555d76e1d4d5fa092b190ffb99cdde8880131c063e4b53435df3a022ed4d3da"; + sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [lesstif ncurses libX11 libXt]; configureFlags = "--with-x"; + + patches = [ ./gcc44.patch ]; meta = { homepage = http://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; diff --git a/pkgs/development/tools/misc/ddd/gcc44.patch b/pkgs/development/tools/misc/ddd/gcc44.patch new file mode 100644 index 000000000000..c4e4004b12e0 --- /dev/null +++ b/pkgs/development/tools/misc/ddd/gcc44.patch @@ -0,0 +1,11 @@ +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504868 +--- a/ddd/strclass.C~ 2008-11-07 17:57:13.000000000 +0000 ++++ b/ddd/strclass.C 2008-11-07 17:57:27.000000000 +0000 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + + void string::error(const char* msg) const