Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

geary: Clean up dependencies #367247

Merged
merged 3 commits into from
Dec 22, 2024
Merged

geary: Clean up dependencies #367247

merged 3 commits into from
Dec 22, 2024

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Dec 22, 2024

Things done

Follow up to #366636

cc @uninsane @misuzu

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

Following https://gitlab.gnome.org/GNOME/geary/-/commit/adca034818ba2ed8b31e1bc7ae2fcbae1264724b,
we removed the mentioned patching in df76d94
but forgot to drop the comment since it was not attached to the removed block.
As far as I can understand https://gitlab.gnome.org/GNOME/geary/-/issues/439, the dependency is only needed for `share/gettext/its/appdata.{its,loc}` files used when generating the POT file, which should not be needed at build time so https://gitlab.gnome.org/GNOME/geary/-/merge_requests/243 should never have been merged.

Additionally, `appstream-glib` is no longer maintained and `${appstream}/share/gettext/its/metainfo.{its,loc}` would be used nowadays.

Opened https://gitlab.gnome.org/GNOME/geary/-/merge_requests/856, though it is hard to test because `glib` propagates `gettext`, which also has `metainfo.its`.

Also note `appstream-glib` is still an optional build time dependency (`appstream-util validate-relax` can be used to validate the AppStream file).
But we do not care about that so it is fine that c5aa34f dropped it from `nativeBuildInputs`.
Without this glib tools complain at build time:

    [6/708] Generating ui/org.gnome.Geary_h with a custom command
    xml-stripblanks preprocessing requested, but XMLLINT is not set, and xmllint is not in PATH

Partially reverts c5aa34f.
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 22, 2024
@uninsane
Copy link
Contributor

Run-time dependency messaging-menu found: NO (tried pkgconfig and cmake)

just noticed it, not a new error. sounds like it's only used for optional Unity desktop integration. tried adding ayatana-indicator-messages to buildInputs since it provides that pkgconf module, but then the build failed with Vala shared or static library 'MessagingMenu-1.0' not found.

not a blocker, just dropping that here in case you recognize some easy fix for it.

@jtojnar
Copy link
Member Author

jtojnar commented Dec 22, 2024

That probably means the library needs vala in dependencies, maybe a configure flag as well. But not sure if we want this anyway.

@uninsane uninsane merged commit 9e1ab01 into NixOS:master Dec 22, 2024
23 of 24 checks passed
@jtojnar jtojnar deleted the geary-cross branch December 22, 2024 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants