colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: enable Loupe for cross compilation

Browse Source
This commit is contained in:
Colin
2023-12-13 02:00:43 +00:00
parent 7e4d6853f5
commit f77a18a655
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
overlays/cross.nix
View File

@@ -1361,6 +1361,24 @@ in with final; {
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ pkg-config ]; # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ pkg-config ];
}); });
loupe = prev.loupe.overrideAttrs (upstream:
let
cargoEnvWrapper = buildPackages.writeShellScript "cargo-env-wrapper" ''
CARGO_BIN="$1"
shift
CARGO_OP="$1"
shift
${rust.envVars.setEnv} "$CARGO_BIN" "$CARGO_OP" --target "${rust.envVars.rustHostPlatformSpec}" "$@"
'';
in {
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/meson.build \
--replace "cargo, 'build'," "'${cargoEnvWrapper}', cargo, 'build'," \
--replace "'src' / rust_target" "'src' / '${rust.envVars.rustHostPlatformSpec}' / rust_target"
'';
});
mepo = (prev.mepo.override { mepo = (prev.mepo.override {
# nixpkgs mepo correctly puts `zig_0_11.hook` in nativeBuildInputs, # nixpkgs mepo correctly puts `zig_0_11.hook` in nativeBuildInputs,
# but for some reason that tries to use the host zig instead of the build zig. # but for some reason that tries to use the host zig instead of the build zig.