fix valgrind
Some checks failed
Hydra valgrind Hydra build #53781 of nix-packages:riscv64-linux-master-pr276:valgrind
Hydra akkoma Hydra build #53782 of nix-packages:riscv64-linux-master-pr276:akkoma
Hydra mautrix-telegram Hydra build #53777 of nix-packages:riscv64-linux-master-pr276:mautrix-telegram
Hydra plover-plugin-yaml-dictionary Hydra build #53778 of nix-packages:riscv64-linux-master-pr276:plover-plugin-yaml-dictionary
Hydra fcitx5 Hydra build #53779 of nix-packages:riscv64-linux-master-pr276:fcitx5
Hydra plover-plugin-emoji Hydra build #53780 of nix-packages:riscv64-linux-master-pr276:plover-plugin-emoji
Hydra plover-plugin-rkb1-hid Hydra build #53783 of nix-packages:riscv64-linux-master-pr276:plover-plugin-rkb1-hid
Hydra plover-plugins-manager Hydra build #53784 of nix-packages:riscv64-linux-master-pr276:plover-plugins-manager
Hydra plover-plugin-tapey-tape Hydra build #53785 of nix-packages:riscv64-linux-master-pr276:plover-plugin-tapey-tape
Hydra plover-plugin-machine-hid Hydra build #53786 of nix-packages:riscv64-linux-master-pr276:plover-plugin-machine-hid
Hydra plover Hydra build #53787 of nix-packages:riscv64-linux-master-pr276:plover
Hydra kubo Hydra build #53727 of nix-packages:riscv64-linux-master-pr276:kubo
Hydra emoji-volpeon-bunhd-flip Hydra build #53729 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-bunhd-flip
Hydra emoji-volpeon-raccoon Hydra build #53728 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-raccoon
Hydra mautrix-discord Hydra build #53730 of nix-packages:riscv64-linux-master-pr276:mautrix-discord
Hydra nasin-nanpa Hydra build #53733 of nix-packages:riscv64-linux-master-pr276:nasin-nanpa
Hydra mautrix-whatsapp Hydra build #53734 of nix-packages:riscv64-linux-master-pr276:mautrix-whatsapp
Hydra woodpecker-agent Hydra build #53731 of nix-packages:riscv64-linux-master-pr276:woodpecker-agent
Hydra woodpecker-cli Hydra build #53737 of nix-packages:riscv64-linux-master-pr276:woodpecker-cli
Hydra element-web Hydra build #53643 of nix-packages:riscv64-linux-master-pr276:element-web
Hydra python-instagram Hydra build #53848 of nix-packages:riscv64-linux-master-pr276:python-instagram
Hydra vf2Kernel Hydra build #53736 of nix-packages:riscv64-linux-master-pr276:vf2Kernel
Hydra woodpecker-frontend Hydra build #53744 of nix-packages:riscv64-linux-master-pr276:woodpecker-frontend
Hydra woodpecker-server Hydra build #53868 of nix-packages:riscv64-linux-master-pr276:woodpecker-server
Hydra emoji-volpeon-fox Hydra build #53741 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-fox
Hydra python-tulir-telethon Hydra build #53753 of nix-packages:riscv64-linux-master-pr276:python-tulir-telethon
Hydra pleroma-fe Hydra build #53748 of nix-packages:riscv64-linux-master-pr276:pleroma-fe
Hydra emoji-volpeon-vlpn Hydra build #53754 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-vlpn
Hydra emoji-volpeon-blobfox-flip Hydra build #53755 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-blobfox-flip
Hydra emoji-volpeon-drgn Hydra build #53758 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-drgn
Hydra admin-fe Hydra build #53757 of nix-packages:riscv64-linux-master-pr276:admin-fe
Hydra emoji-volpeon-gphn Hydra build #53759 of nix-packages:riscv64-linux-master-pr276:emoji-volpeon-gphn

This commit is contained in:
Charlotte 🦝 Delenk 2023-06-26 07:26:56 +01:00
parent 9b6af9f819
commit 03e0cc4504
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122

View file

@ -4,9 +4,6 @@
fetchFromGitHub,
perl,
gdb,
cctools,
xnu,
bootstrap_cmds,
autoreconfHook,
}: let
source = builtins.fromJSON (builtins.readFile ./source.json);
@ -27,7 +24,7 @@ in
# GDB is needed to provide a sane default for `--db-command'.
# Perl is needed for `callgrind_{annotate,control}'.
buildInputs = [gdb perl] ++ lib.optionals (stdenv.isDarwin) [bootstrap_cmds xnu];
buildInputs = [gdb perl];
# Perl is also a native build input.
nativeBuildInputs = [autoreconfHook perl];
@ -35,39 +32,9 @@ in
enableParallelBuilding = true;
separateDebugInfo = stdenv.isLinux;
preConfigure = lib.optionalString stdenv.isDarwin (
let
OSRELEASE = ''
$(awk -F '"' '/#define OSRELEASE/{ print $2 }' \
<${xnu}/Library/Frameworks/Kernel.framework/Headers/libkern/version.h)'';
in ''
echo "Don't derive our xnu version using uname -r."
substituteInPlace configure --replace "uname -r" "echo ${OSRELEASE}"
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
echo "getting rid of the \`-arch' GCC option..."
find -name Makefile\* -exec \
sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
sed -i coregrind/link_tool_exe_darwin.in \
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
substituteInPlace coregrind/m_debuginfo/readmacho.c \
--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 \
--replace /usr/bin/ld ${cctools}/bin/ld
''
);
# To prevent rebuild on linux when moving darwin's postPatch fixes to preConfigure
postPatch = "";
configureFlags =
lib.optional (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin") "--enable-only64bit"
++ lib.optional stdenv.hostPlatform.isDarwin "--with-xcodedir=${xnu}/include";
doCheck = true;
postInstall = ''