Skip to content

Comments

vala: search for vapi files in targetOffset, not hostOffset#269171

Closed
uninsane wants to merge 3 commits intoNixOS:masterfrom
uninsane:pr-vala-offset
Closed

vala: search for vapi files in targetOffset, not hostOffset#269171
uninsane wants to merge 3 commits intoNixOS:masterfrom
uninsane:pr-vala-offset

Conversation

@uninsane
Copy link
Contributor

Description of changes

this is in response to an old TODO: #189397 (comment); CC @Artturin

this PR should only change things (practically) for cross-compiled builds. previously, vala projects would struggle to find the vapi (vala API) files of their build dependencies. workarounds were to copy these dependencies into nativeBuildInputs, or provide the project some other way to find the API info (e.g. gobject-introspection). vala now looks in the right place for vapi files, as demonstrated by the commits in this patch which remove both class of workaround.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Priorities

Add a 👍 reaction to pull requests you find important.

the vala setup hook is able to find these via buildInputs now
this is no longer needed now that the vala setup hook behaves correctly for cross compilation
@uninsane uninsane requested a review from jtojnar as a code owner November 22, 2023 11:50
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Nov 22, 2023
@uninsane uninsane added 6.topic: cross-compilation Building packages on a different platform than they will be used on and removed 6.topic: GNOME GNOME desktop environment and its underlying platform labels Nov 22, 2023
@Artturin
Copy link
Member

I opened a pr doing the same thing last week #267550

@Artturin Artturin closed this Nov 22, 2023
@uninsane
Copy link
Contributor Author

I opened a pr doing the same thing last week #267550

nice, feel free to CC me in the future if it's work spawned from a PR discussion like that btw

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants