@@ -1,42 +1,30 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, nix-update-script
4−, pantheon
55, meson
66, ninja
77, pkg-config
88, vala
9−, libgee
9+, evolution-data-server
10+, glib
1011, granite
1112, gtk3
12−, libaccounts-glib
1313, libgdata
1414, libhandy
15−, libsignon-glib
16−, json-glib
17−, librest
18−, webkitgtk
19−, libsoup
2015, sqlite
2116, switchboard
22−, evolution-data-server
2317}:
2418
2519stdenv.mkDerivation rec {
2620 pname = "switchboard-plug-onlineaccounts";
27− version = "6.2.1";
21+ version = "6.2.2";
2822
2923 src = fetchFromGitHub {
3024 owner = "elementary";
3125 repo = pname;
3226 rev = version;
33− sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92";
34− };
35−
36− passthru = {
37− updateScript = nix-update-script {
38− attrPath = "pantheon.${pname}";
39− };
27+ sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
4028 };
4129
4230 nativeBuildInputs = [
@@ -48,23 +36,20 @@ stdenv.mkDerivation rec {
4836
4937 buildInputs = [
5038 evolution-data-server
39+ glib
5140 granite
5241 gtk3
53− json-glib
54− libaccounts-glib
5542 libgdata
56− libgee
5743 libhandy
58− libsignon-glib
59− libsoup
60− librest
6144 sqlite # needed for camel-1.2
6245 switchboard
63− webkitgtk
6446 ];
6547
66− PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
67− PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
48+ passthru = {
49+ updateScript = nix-update-script {
50+ attrPath = "pantheon.${pname}";
51+ };
52+ };
6853
6954 meta = with lib; {
7055 description = "Switchboard Online Accounts Plug";
@@ -73,5 +58,4 @@ stdenv.mkDerivation rec {
7358 platforms = platforms.linux;
7459 maintainers = teams.pantheon.members;
7560 };
76−
7761}