diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
commit | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (patch) | |
tree | 96bf2739244a52d15556e1207bdfaf93d6353bee /pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | |
parent | c9d3fc7cad4d243025f9a0e1b3eec9305863c06d (diff) | |
parent | f7397f21ab841955eb277919f19035cbc336e88b (diff) | |
download | nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.gz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.bz2 nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.lz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.xz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.zst nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 2abe8b28c039..d3d14f555cfa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,24 +1,20 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc -, telepathy-glib, intltool, dbus_libs, icu, glib-networking -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc +, telepathy-glib, gettext, dbus_libs, icu, glib-networking +, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos }: -stdenv.mkDerivation rec { - name = "gnome-online-accounts-${version}"; - version = "3.26.2"; +let + pname = "gnome-online-accounts"; + version = "3.28.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - outputs = [ "out" "man" "dev" "devdoc" ]; configureFlags = [ @@ -32,14 +28,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome-common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk-doc + pkgconfig vala gettext wrapGAppsHook + libxslt docbook_xsl docbook_xsl_ns gtk-doc ]; buildInputs = [ glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup gcr kerberos ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; |