cross: get snapshot
to build
This commit is contained in:
parent
5619bb3334
commit
631e0db7b4
|
@ -1857,6 +1857,25 @@ in with final; {
|
||||||
# inherit (emulated) stdenv;
|
# 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)
|
# 2023/12/19: upstreaming is blocked by qtsvg (via pipewire)
|
||||||
spot = prev.spot.overrideAttrs (upstream:
|
spot = prev.spot.overrideAttrs (upstream:
|
||||||
let
|
let
|
||||||
|
|
Loading…
Reference in New Issue
Block a user