git.iko.soy/typeable/nixpkgs
on master help sign in
valgrind: try fixing on darwin
commite5b91d92a01178f9eecc0c7dd09a89e29fe9cc6f authorVladimír Čunát <v@cunat.cz> dateWed 5 Aug 2020, 19:03 (6 years ago) parent2a2d5eb
1 file changed+2−5
pkgs/development/tools/analysis/valgrind/default.nix+2−5
pkgs/development/tools/analysis/valgrind/default.nix+2−5
@@ -38,10 +38,6 @@ stdenv.mkDerivation rec {
3838 sed -i coregrind/link_tool_exe_darwin.in \
3939 -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
4040
41− echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach"
42− substituteInPlace coregrind/Makefile.in \
43− --replace /usr/include/mach ${xnu}/include/mach
44−
4541 substituteInPlace coregrind/m_debuginfo/readmacho.c \
4642 --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil
4743
@@ -54,7 +50,8 @@ stdenv.mkDerivation rec {
5450 postPatch = "";
5551
5652 configureFlags =
57− stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit";
53+ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
54+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
5855
5956 doCheck = false; # fails
6057