Merge pull request #71260 from worldofpeace/goa-meson

gnome3.gnome-online-accounts: build with meson

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

@@ -1,42 +1,94 @@
-{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
+{ stdenv
-, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
+, fetchFromGitLab
-, gettext, icu, glib-networking
+, pkgconfig
-, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
+, vala
+, glib
+, meson
+, ninja
+, python3
+, libxslt
+, gtk3
+, webkitgtk
+, json-glib
+, librest
+, libsecret
+, gtk-doc
+, gobject-introspection
+, gettext
+, icu
+, glib-networking
+, libsoup
+, docbook_xsl
+, docbook_xml_dtd_412
+, gnome3
+, gcr
+, kerberos
+, gvfs
+, dbus
+, wrapGAppsHook
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-online-accounts";
-  version = "3.34.0";
+  version = "3.34.1";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
+  # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+  src = fetchFromGitLab {
-    sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4";
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gnome-online-accounts";
+    rev = version;
+    sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];
 
-  configureFlags = [
+  mesonFlags = [
-    "--enable-media-server"
+    "-Dfedora=false" # not useful in NixOS or for NixOS users.
-    "--enable-kerberos"
+    "-Dgtk_doc=true"
-    "--enable-lastfm"
+    "-Dlastfm=true"
-    "--enable-todoist"
+    "-Dman=true"
-    "--enable-gtk-doc"
+    "-Dmedia_server=true"
-    "--enable-documentation"
   ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
-    pkgconfig gobject-introspection vala gettext wrapGAppsHook
+    dbus # used for checks and pkgconfig to install dbus service/s
-    libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
+    docbook_xml_dtd_412
+    docbook_xsl
+    gettext
+    gobject-introspection
+    gtk-doc
+    libxslt
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
   ];
+
   buildInputs = [
-    glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
+    gcr
-    gcr kerberos
+    glib
+    glib-networking
+    gtk3
+    gvfs # OwnCloud, Google Drive
+    icu
+    json-glib
+    kerberos
+    librest
+    libsecret
+    libsoup
+    webkitgtk
   ];
 
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
@@ -45,7 +97,10 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
+    description = "Single sign-on framework for GNOME";
     platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
     maintainers = gnome3.maintainers;
   };
 }