Unverified Commit 8b4f08e8 authored by Maxine Aubrey's avatar Maxine Aubrey
Browse files

gnome-online-accounts: 3.48.1 → 3.50.0 

https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.48.1...3.50.0



Port to GTK4. Still provides goa-1.0.

* It is unclear to me why gvfs is needed here, I searched for
  `org.gnome.system`, `dns_sd`, `smb`, `gvfs` in the source but found
  nothing useful (I am aware of the `gnomeSupport` option in gvfs
  default to `false` to prevent circular dependency.).
* Same for icu.

Changelog-Reviewed-By: default avatarMaxine Aubrey <max@ine.dev>
parent 5456fd20

pkgs/development/libraries/gnome-online-accounts/default.nix

+11 −16
Original line number Diff line number Diff line
@@ -7,38 +7,37 @@ 
, meson

, ninja

, libxslt

, gtk3

, gtk4

, enableBackend ? stdenv.isLinux

, webkitgtk_4_1

, json-glib

, libadwaita

, librest_1_0

, libxml2

, libsecret

, gtk-doc

, gobject-introspection

, gettext

, icu

, glib-networking

, libsoup_3

, docbook-xsl-nons

, docbook_xml_dtd_412

, gnome

, gcr

, gcr_4

, libkrb5

, gvfs

, dbus

, wrapGAppsHook

, wrapGAppsHook4

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "gnome-online-accounts";

  version = "3.48.1";

  version = "3.50.0";



  outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];



  src = fetchurl {

    url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";

    hash = "sha256-PqDHEIS/WVzOXKo3zv8uhT0OyWRLsB/UZDMArblRf4o=";

    hash = "sha256-sPZPDc+7iIWjp1nhyd5/sgSts85r0ywwvPUtVTPAbU4=";

  };



  mesonFlags = [
@@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "-Dgoabackend=${lib.boolToString enableBackend}"

    "-Dgtk_doc=${lib.boolToString enableBackend}"

    "-Dman=${lib.boolToString enableBackend}"

    "-Dmedia_server=true"

    "-Dwebdav=true"

  ];



  nativeBuildInputs = [
@@ -61,28 +60,24 @@ stdenv.mkDerivation (finalAttrs: { 
    ninja

    pkg-config

    vala

    wrapGAppsHook

    wrapGAppsHook4

  ];



  buildInputs = [

    gcr

    gcr_4

    glib

    glib-networking

    gtk3

    gtk4

    libadwaita

    gvfs # OwnCloud, Google Drive

    icu

    json-glib

    libkrb5

    librest_1_0

    libxml2

    libsecret

    libsoup_3

  ] ++ lib.optionals enableBackend [

    webkitgtk_4_1

  ];



  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";



  separateDebugInfo = true;



  passthru = {