diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-10-28 22:25:50 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-10-28 22:25:50 +0000 |
| commit | 4c5fcfb0a8e0ccb4a6c5a08da75ccfde52cc0939 (patch) | |
| tree | 5a395f751be1a11e7a066dc5efc84888f2bc0978 | |
| parent | f7947871a336f54af8bd193905b141d0495ae4d9 (diff) | |
GDB: Build with Expat support, to get syscall info.
svn path=/nixpkgs/trunk/; revision=18009
| -rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index a3cb554ec8feb..e4163f020c001 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, texinfo }: +{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo }: stdenv.mkDerivation rec { name = "gdb-7.0"; @@ -9,14 +9,17 @@ stdenv.mkDerivation rec { }; # TODO: Add optional support for Python scripting. - buildInputs = [ ncurses readline gmp mpfr texinfo ]; + buildInputs = [ ncurses readline gmp mpfr expat texinfo ]; - configureFlags = "--with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline"; + configureFlags = + '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline + --with-expat --with-libexpat-prefix=${expat} + ''; - postInstall = '' - # Remove Info files already provided by Binutils and other packages. - rm -v $out/share/info/{standards,configure,bfd}.info - ''; + postInstall = + '' # Remove Info files already provided by Binutils and other packages. + rm -v $out/share/info/{standards,configure,bfd}.info + ''; meta = { description = "GDB, the GNU Project debugger"; @@ -32,6 +35,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.cygwin; - maintainers = stdenv.lib.maintainers.ludo; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1967252199fb4..e14e0e598940e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2984,7 +2984,7 @@ let }; gdb = import ../development/tools/misc/gdb { - inherit fetchurl stdenv ncurses gmp mpfr texinfo; + inherit fetchurl stdenv ncurses gmp mpfr expat texinfo; readline = readline5; }; |