diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-08-05 19:03:10 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-08-05 19:04:13 +0200 |
commit | e5b91d92a01178f9eecc0c7dd09a89e29fe9cc6f (patch) | |
tree | fab29132b1340421b86846b97649b3af80f61b5c /pkgs/development/tools/analysis/valgrind | |
parent | 2a2d5ebc69d4002f86fb5c883a179ae936dd936f (diff) |
valgrind: try fixing on darwin
Diffstat (limited to 'pkgs/development/tools/analysis/valgrind')
-rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 7db6035430519..2e485b3ed67ba 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -38,10 +38,6 @@ stdenv.mkDerivation rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' - echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach" - substituteInPlace coregrind/Makefile.in \ - --replace /usr/include/mach ${xnu}/include/mach - substituteInPlace coregrind/m_debuginfo/readmacho.c \ --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil @@ -54,7 +50,8 @@ stdenv.mkDerivation rec { postPatch = ""; configureFlags = - stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"; + stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit" + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include"; doCheck = false; # fails |