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

cross: get snapshot to build

Browse Source
This commit is contained in:
Colin 2024-05-19 10:32:05 +00:00
parent 5619bb3334
commit 631e0db7b4
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
overlays/cross.nix
View File

@ -1857,6 +1857,25 @@ in with final; {
# inherit (emulated) stdenv;
# };
snapshot = prev.snapshot.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 {
# fixes "error: linker `cc` not found"
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/meson.build \
--replace "cargo, 'build'," "'${cargoEnvWrapper}', cargo, 'build'," \
--replace "'src' / rust_target" "'src' / '${rust.envVars.rustHostPlatformSpec}' / rust_target"
'';
});
# 2023/12/19: upstreaming is blocked by qtsvg (via pipewire)
spot = prev.spot.overrideAttrs (upstream:
let