diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 22:20:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 22:20:03 -0400 |
| commit | 87944c3125c4e69a69e76003c0ed5bf47bf0c4d8 (patch) | |
| tree | 6c6e4f084e2ed6567719d44b4dd377829cd2c6f8 /pkgs/development/tools/analysis | |
| parent | 1cf626ce29f154c5742196327e03dbd61d0ed988 (diff) | |
| parent | c1f1a0ea159a4513be524fa775ad708debd19aa1 (diff) | |
| download | nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar.gz nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar.bz2 nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar.lz nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar.xz nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.tar.zst nixlib-87944c3125c4e69a69e76003c0ed5bf47bf0c4d8.zip | |
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 8 |
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 78f40913eb5f..9942123a5120 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 \ |