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.

Sign up for GitHub

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: fix cross compilation #366636

Merged
merged 1 commit into from
Dec 20, 2024
Merged

geary: fix cross compilation #366636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/by-name/ge/geary/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
appstream-glib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was here for appstream-util, though it is only required to optionally validate the metainfo file, which is not something we want to do in the build anyway.

desktop-file-utils
gettext
gobject-introspection
itstool
libxml2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was here for glib tools stop complaining 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

meson
ninja
pkg-config
Expand All @@ -72,6 +70,7 @@ stdenv.mkDerivation rec {

buildInputs = [
adwaita-icon-theme
appstream-glib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

enchant2
folks
gcr
Expand All @@ -91,6 +90,7 @@ stdenv.mkDerivation rec {
libsecret
libunwind
libstemmer
libxml2
libytnef
sqlite
webkitgtk_4_1
Expand All @@ -109,6 +109,8 @@ stdenv.mkDerivation rec {
"-Dcontractor=enabled" # install the contractor file (Pantheon specific)
];

strictDeps = true;

# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
# https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
postPatch = ''
Expand Down
Loading