mepo: fix autoPatchelfHook placement so it cross compiles

This commit is contained in:
Colin 2023-08-12 02:44:14 +00:00
parent 95d04467a8
commit 8ec22b6320

View File

@ -951,9 +951,11 @@ in {
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
dontUseZigCheck = true; dontUseZigCheck = true;
nativeBuildInputs = upstream.nativeBuildInputs ++ [ nativeBuildInputs = upstream.nativeBuildInputs ++ [
# zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking # zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking.
final.autoPatchelfHook # this shouldn't have to be buildPackages.autoPatchelfHook...
# zig hard-codes `pkg-config` inside lib/std/build.zig # but without specifying `buildPackages` the host coreutils ends up on the builder's path and breaks things
final.buildPackages.autoPatchelfHook
# # zig hard-codes `pkg-config` inside lib/std/build.zig
(final.buildPackages.writeShellScriptBin "pkg-config" '' (final.buildPackages.writeShellScriptBin "pkg-config" ''
exec $PKG_CONFIG $@ exec $PKG_CONFIG $@
'') '')