summary refs log tree commit diff
path: root/pkgs/development/tools/analysis/valgrind/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-01-19 22:27:07 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-01-19 22:27:07 +0000
commit1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5 (patch)
treeac406d5ba8cf06d2eb94926665bf7b7326f84ada /pkgs/development/tools/analysis/valgrind/default.nix
parentf93620419fc4be3c34ba08649ed13100a3f572e3 (diff)
downloadnixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar.gz
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar.bz2
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar.lz
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar.xz
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.tar.zst
nixpkgs-1d6d92c9a1cc9a3ecf4f7b38075b90bcffff02a5.zip
* Make Valgrind compile with Glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19554
Diffstat (limited to 'pkgs/development/tools/analysis/valgrind/default.nix')
-rw-r--r--pkgs/development/tools/analysis/valgrind/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index ebd2d3ab07e..fdf2bf1777f 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gdb }:
+{ stdenv, fetchurl, perl, gdb, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.5.0";
@@ -8,9 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl";
   };
 
+  # Make Valgrind compile with Glibc 2.11.
+  patches = [ ./glibc-2.11.patch ];
+  patchFlags = "-p0";
+  preConfigure = "autoreconf";
+
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
-  buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
+  buildInputs = [ perl autoconf automake ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
 
   configureFlags =
     if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];