From c18603c3b3937da24635407023c868fa0091e0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 12 Jan 2009 18:06:32 +0000 Subject: [PATCH] GDB: Use the system Readline library. svn path=/nixpkgs/trunk/; revision=13746 --- pkgs/development/tools/misc/gdb/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 0853b9d221b7..fd8f7c4be961 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, gmp, mpfr, texinfo }: +{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, texinfo }: stdenv.mkDerivation rec { name = "gdb-6.8"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "067qpnpgmz9jffi208q5c981xsyn8naq3rkp5ypg477lddcgvpzf"; }; - buildInputs = [ ncurses gmp mpfr texinfo ]; + buildInputs = [ ncurses readline gmp mpfr texinfo ]; - configureFlags = "--with-gmp=${gmp} --with-mpfr=${mpfr}"; + configureFlags = "--with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline"; postInstall = '' # Remove Info files already provided by Binutils and other packages. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15a6b23edc06..c19e6ea816a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2591,7 +2591,7 @@ let }; gdb = import ../development/tools/misc/gdb { - inherit fetchurl stdenv ncurses gmp mpfr texinfo; + inherit fetchurl stdenv ncurses readline gmp mpfr texinfo; }; valgrind = import ../development/tools/analysis/valgrind {