diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a58ad0f39b2..3c59bf45eff 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; - })]; + }) ./linux-4.0.patch]; # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. diff --git a/pkgs/development/tools/analysis/valgrind/linux-4.0.patch b/pkgs/development/tools/analysis/valgrind/linux-4.0.patch new file mode 100644 index 00000000000..1a2c2d86207 --- /dev/null +++ b/pkgs/development/tools/analysis/valgrind/linux-4.0.patch @@ -0,0 +1,12 @@ +diff -Naur valgrind-3.10.1/configure valgrind-3.10.1-patch/configure +--- valgrind-3.10.1/configure 2014-11-25 11:42:25.000000000 -0800 ++++ valgrind-3.10.1-patch/configure 2015-04-21 09:45:37.656113841 -0700 +@@ -5553,7 +5553,7 @@ + kernel=`uname -r` + + case "${kernel}" in +- 2.6.*|3.*) ++ 2.6.*|3.*|4.*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5 + $as_echo "2.6.x/3.x family (${kernel})" >&6; } +