nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

valgrind: try fixing on darwin

Browse Source
This commit is contained in:
Vladimír Čunát 2020-08-05 19:03:10 +02:00
parent 2a2d5ebc69
commit e5b91d92a0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/analysis/valgrind/default.nix
View File

@ -38,10 +38,6 @@ stdenv.mkDerivation rec {
sed -i coregrind/link_tool_exe_darwin.in \ sed -i coregrind/link_tool_exe_darwin.in \
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' -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 \ substituteInPlace coregrind/m_debuginfo/readmacho.c \
--replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil
@ -54,7 +50,8 @@ stdenv.mkDerivation rec {
postPatch = ""; postPatch = "";
configureFlags = 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 doCheck = false; # fails