From ec232441a2428798a9dc3d4e9b49204a92b935ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Apr 2004 14:38:43 +0000
Subject: [PATCH] * Valgrind: upgrade to 2.1.1.

svn path=/nixpkgs/trunk/; revision=966
---
 pkgs/development/tools/misc/valgrind/default.nix | 15 +++++++++------
 pkgs/system/all-packages-generic.nix             |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index b707c0c4157..a7c536bed6d 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -1,11 +1,14 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, perl}:
+
+# Note: I added the Perl dependency for Valgrind 2.1.1.  It's needed
+# to generate some files.  Maybe in stable releases we won't need
+# Perl.
 
 stdenv.mkDerivation {
-  name = "valgrind-2.1.0";
+  name = "valgrind-2.1.1";
   src = fetchurl {
-    url = http://developer.kde.org/~sewardj/valgrind-2.1.0.tar.bz2;
-    md5 = "3e4056dd45163a5f555a23ced2f95191";
-#    url = http://developer.kde.org/~sewardj/valgrind-2.1.1.tar.bz2;
-#    md5 = "0010c3e8f054ecc633151c62044b646d";
+    url = http://developer.kde.org/~sewardj/valgrind-2.1.1.tar.bz2;
+    md5 = "0010c3e8f054ecc633151c62044b646d";
   };
+  buildInputs = [perl];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 552f674d3f4..27774f82da7 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -156,7 +156,7 @@ rec {
   };
 
   valgrind = (import ../development/tools/misc/valgrind) {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv perl;
   };
 
   texinfo = (import ../development/tools/misc/texinfo) {