geary: fix cross compilation #366636
geary: fix cross compilation #366636
Conversation
uninsane
added
the
6.topic: cross-compilation
github-actions
bot
added
10.rebuild-darwin: 0
| @@ -56,12 +56,10 @@ stdenv.mkDerivation rec { | |||
| }; | |||
|
|
|||
| nativeBuildInputs = [ | |||
| appstream-glib | |||
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
| @@ -72,6 +70,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| buildInputs = [ | |||
| adwaita-icon-theme | |||
| appstream-glib | |||
There was a problem hiding this comment.
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.
nix-build -A pkgsCross.aarch64-multiplatform.gearyThings done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.