Unverified Commit 9e1ab011 authored by Colin's avatar Colin Committed by GitHub
Browse files

geary: Clean up dependencies (#367247)

parents 899306fa 3df96471
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@
  glib-networking,
  gobject-introspection,
  gspell,
  appstream-glib,
  libstemmer,
  libytnef,
  libhandy,
@@ -60,6 +59,7 @@ stdenv.mkDerivation rec {
    gettext
    gobject-introspection
    itstool
    libxml2 # for xmllint for xml-stripblanks preprocessing
    meson
    ninja
    pkg-config
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    adwaita-icon-theme
    appstream-glib
    enchant2
    folks
    gcr
@@ -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
  '';