Valgrind: Fix dependencies.

svn path=/nixpkgs/trunk/; revision=11961

2 files changed, 18 insertions, 3 deletions

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 7f46228304b23..05ba5d75894dd 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,17 +1,32 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, perl, gdb }:
 
 stdenv.mkDerivation {
   name = "valgrind-3.3.0";
+
   src = fetchurl {
     url = http://valgrind.org/downloads/valgrind-3.3.0.tar.bz2;
     sha256 = "0yllx5a2f5bx18gqz74aikr27zxwpblswn65lqvm9rbzswlq5w2s";
   };
 
+  # Perl is needed for `cg_annotate'.
+  # GDB is needed to provide a sane default for `--db-command'.
+  buildInputs = [ perl gdb ];
+
   configureFlags =
     if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
 
   meta = {
     homepage = http://www.valgrind.org/;
-    description = "Award-winning suite of tools for debugging and profiling Linux programs";
+    description = "Valgrind, a debugging and profiling tool suite";
+
+    longDescription = ''
+      Valgrind is an award-winning instrumentation framework for
+      building dynamic analysis tools.  There are Valgrind tools that
+      can automatically detect many memory management and threading
+      bugs, and profile your programs in detail.  You can also use
+      Valgrind to build new tools.
+    '';
+
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 547eeedf84f2e..f753ee6479c4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2255,7 +2255,7 @@ let pkgs = rec {
   };
 
   valgrind = import ../development/tools/analysis/valgrind {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv perl gdb;
   };
 
   xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") {