From 8cabf4d5c56ef23eb79429e087dc702f049e9bfe Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 3 Mar 2019 19:55:51 -0500 Subject: treewide: rename llvm-dsymutil to dsymutil This is a change introduced between llvm 5 and llvm 7. --- pkgs/development/tools/analysis/valgrind/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'pkgs/development/tools/analysis/valgrind/default.nix') diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 78f40913eb5..9942123a512 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -44,14 +44,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 \ -- cgit 1.4.1