From d539b0976845c3754a41a8706ae6188a87f6a20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 4 Dec 2018 13:17:49 +0100 Subject: [PATCH] valgrind: run autoconf to pick up Makefile.am patch https://github.com/NixOS/nixpkgs/pull/51107 added a patch to Makefile.am to fix a race condition in the build. It was unfortunately never picked up as we we're using the generated makefile from the tarball. --- pkgs/development/tools/analysis/valgrind/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index df99ecb13bb3..ca8d64f91327 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, llvm, cctools, xnu, bootstrap_cmds }: +{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds, autoreconfHook }: stdenv.mkDerivation rec { name = "valgrind-3.14.0"; @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03"; }; + # autoreconfHook is needed to pick up patching of Makefile.am + # Remove when the patch no longer applies. patches = [ ./coregrind-makefile-race.patch ]; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ];