summary refs log tree commit diff
path: root/pkgs/development/tools/analysis/valgrind/default.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-03-03 19:55:51 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-04-26 21:54:50 -0400
commit8cabf4d5c56ef23eb79429e087dc702f049e9bfe (patch)
tree39d227837a2f15e08929b71fac02a6c28da230ca /pkgs/development/tools/analysis/valgrind/default.nix
parent2b0b63c22986f0465fd5cee3772f18335f34c845 (diff)
downloadnixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.gz
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.bz2
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.lz
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.xz
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.tar.zst
nixpkgs-8cabf4d5c56ef23eb79429e087dc702f049e9bfe.zip
treewide: rename llvm-dsymutil to dsymutil
This is a change introduced between llvm 5 and llvm 7.
Diffstat (limited to 'pkgs/development/tools/analysis/valgrind/default.nix')
-rw-r--r--pkgs/development/tools/analysis/valgrind/default.nix8
1 files changed, 1 insertions, 7 deletions
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 \