diff options
Diffstat (limited to 'pkgs/development/tools/analysis/valgrind/default.nix')
-rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 88a53a7667ed..4def201952a9 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds, autoreconfHook }: +{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { - name = "valgrind-3.14.0"; + name = "valgrind-3.15.0"; src = fetchurl { url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2"; - sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03"; + sha256 = "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21"; }; - # autoreconfHook is needed to pick up patching of Makefile.am - # Remove when the patch no longer applies. - patches = [ ./coregrind-makefile-race.patch ]; # Perl is needed for `cg_annotate'. - nativeBuildInputs = [ autoreconfHook perl ]; + nativeBuildInputs = [ perl ]; outputs = [ "out" "dev" "man" "doc" ]; @@ -44,14 +41,8 @@ stdenv.mkDerivation rec { substituteInPlace coregrind/Makefile.in \ --replace /usr/include/mach ${xnu}/include/mach - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - find -name "Makefile.in" | while read file; do - substituteInPlace "$file" \ - --replace dsymutil ${llvm}/bin/llvm-dsymutil - done - substituteInPlace coregrind/m_debuginfo/readmacho.c \ - --replace /usr/bin/dsymutil ${llvm}/bin/llvm-dsymutil + --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld" substituteInPlace coregrind/link_tool_exe_darwin.in \ |