From c43c6cbabf85908dc97c802fdad4657849157793 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:24:17 -0400 Subject: [PATCH 1/3] gnome3.gnome-online-accounts: 3.34.0 -> 3.34.1 --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 82847853588..387a00876ed 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -6,13 +6,13 @@ let pname = "gnome-online-accounts"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4"; + sha256 = "0fkqckqkkah5k1xrfqjkk4345aq9c0a6yyvfczy9g96k927clcj8"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From df4170f85347836b38fdb1315dde6c5bf63f8cfb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:27:43 -0400 Subject: [PATCH 2/3] gnome-online-accounts: format, meta attributes --- .../gnome-online-accounts/default.nix | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 387a00876ed..bef4fbfe73d 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook -, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking -, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos +{ stdenv +, fetchurl +, pkgconfig +, vala +, glib +, libxslt +, gtk3 +, wrapGAppsHook +, webkitgtk +, json-glib +, librest +, libsecret +, gtk-doc +, gobject-introspection +, gettext +, icu +, glib-networking +, libsoup +, docbook_xsl +, docbook_xml_dtd_412 +, gnome3 +, gcr +, kerberos }: -let +stdenv.mkDerivation rec { pname = "gnome-online-accounts"; version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; @@ -26,15 +43,30 @@ in stdenv.mkDerivation rec { "--enable-documentation" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ - pkgconfig gobject-introspection vala gettext wrapGAppsHook - libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc + docbook_xml_dtd_412 + docbook_xsl + gettext + gobject-introspection + gtk-doc + libxslt + pkgconfig + vala + wrapGAppsHook ]; + buildInputs = [ - glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup - gcr kerberos + gcr + glib + glib-networking + gtk3 + icu + json-glib + kerberos + librest + libsecret + libsoup + webkitgtk ]; passthru = { @@ -45,7 +77,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; }; } From 5366676eba2713a27c9854926d652cd731ffb1f2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:52:33 -0400 Subject: [PATCH 3/3] gnome3.gnome-online-accounts: build with meson Have to fetch from gitlab as it's not distributed yet. See [0] and [1]. [0]: https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/2#note_271132 [1]: https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 --- .../gnome-online-accounts/default.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index bef4fbfe73d..adbb714c7b2 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,11 +1,13 @@ { stdenv -, fetchurl +, fetchFromGitLab , pkgconfig , vala , glib +, meson +, ninja +, python3 , libxslt , gtk3 -, wrapGAppsHook , webkitgtk , json-glib , librest @@ -21,36 +23,46 @@ , gnome3 , gcr , kerberos +, gvfs +, dbus +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gnome-online-accounts"; version = "3.34.1"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fkqckqkkah5k1xrfqjkk4345aq9c0a6yyvfczy9g96k927clcj8"; + # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-online-accounts"; + rev = version; + sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm"; }; outputs = [ "out" "man" "dev" "devdoc" ]; - configureFlags = [ - "--enable-media-server" - "--enable-kerberos" - "--enable-lastfm" - "--enable-todoist" - "--enable-gtk-doc" - "--enable-documentation" + mesonFlags = [ + "-Dfedora=false" # not useful in NixOS or for NixOS users. + "-Dgtk_doc=true" + "-Dlastfm=true" + "-Dman=true" + "-Dmedia_server=true" ]; nativeBuildInputs = [ + dbus # used for checks and pkgconfig to install dbus service/s docbook_xml_dtd_412 docbook_xsl gettext gobject-introspection gtk-doc libxslt + meson + ninja pkgconfig + python3 vala wrapGAppsHook ]; @@ -60,6 +72,7 @@ stdenv.mkDerivation rec { glib glib-networking gtk3 + gvfs # OwnCloud, Google Drive icu json-glib kerberos @@ -69,6 +82,13 @@ stdenv.mkDerivation rec { 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;