diff options
author | Jade Lovelace <lix@jade.fyi> | 2024-08-20 16:52:46 -0700 |
---|---|---|
committer | jade <lix@jade.fyi> | 2024-08-21 17:09:10 +0000 |
commit | 651cc0e5b4ed4c70ed212b999d8cfa40ca7318e0 (patch) | |
tree | a504f0872caf718db17921b89e42973d040dab4b /scripts/nix-profile.sh.in | |
parent | dba615098d3d28fdb3339e244a4aec778d269e85 (diff) |
fix: build with meson 1.5 also
nixpkgs delivered us the untimely gift of a meson 1.5 upgrade, which
*does* make our lives easier by allowing us to delete wrap generation
code, but it does so at the cost of renaming all rust crates in such a
way that the wrap logic cannot tolerate the new names on the old meson
version ðŸ˜.
It also means that support burden for this is going to be atrocious
until we either give in and vendor meson 1.5 or we make a CI target for
it. Neither seems appealing, though the latter is not super absurd for
ensuring we don't break nixpkgs unstable.
This commit causes meson 1.5 to ignore the .wrap files in subprojects/
entirely (since they have the wrong names lol) and instead use
Cargo.lock, so it now hard-depends on our workspace reshuffling
improvement.
It also deletes the hack that we were using to get the sources of Cargo
deps into meson by using a feature that went unnoticed when this code
was originally written: MESON_PACKAGE_CACHE_DIR:
https://github.com/mesonbuild/meson/blob/8a202de6ec763284cbb7160b9d43d5e7e0703f19/mesonbuild/wrap/wrap.py#L490-L502
Change-Id: I7a28f12fc2812c6ed7537b60bc3025c141a05874
Diffstat (limited to 'scripts/nix-profile.sh.in')
0 files changed, 0 insertions, 0 deletions