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: Clean up dependencies #367247

Merged
merged 3 commits into from
Dec 22, 2024
Merged

geary: Clean up dependencies #367247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c49290
geary: Remove outdated comment
jtojnar Dec 21, 2024
571c664
geary: Remove appstream-glib
jtojnar Dec 22, 2024
3df9647
geary: Re-add libxml2 build dependency
jtojnar Dec 22, 2024
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
10 changes: 6 additions & 4 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 @@ -39,7 +39,6 @@
glib-networking,
gobject-introspection,
gspell,
appstream-glib,
libstemmer,
libytnef,
libhandy,
Expand All @@ -60,6 +59,7 @@ stdenv.mkDerivation rec {
gettext
gobject-introspection
itstool
libxml2 # for xmllint for xml-stripblanks preprocessing
meson
ninja
pkg-config
Expand All @@ -70,7 +70,6 @@ stdenv.mkDerivation rec {

buildInputs = [
adwaita-icon-theme
appstream-glib
enchant2
folks
gcr
Expand Down Expand Up @@ -111,13 +110,16 @@ stdenv.mkDerivation rec {

strictDeps = true;

# NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
# https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
postPatch = ''
chmod +x build-aux/git_version.py

patchShebangs build-aux/git_version.py

# Only used for generating .pot file
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/856
substituteInPlace meson.build \
--replace-fail "appstream_glib = dependency('appstream-glib', version: '>=0.7.10')" ""

chmod +x desktop/geary-attach
'';

Expand Down
Loading