@@ -1,13 +1,55 @@
1−{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
2−, file, librsvg, gnome3, gdk-pixbuf, python3
3−, telepathy-glib, telepathy-farstream, glibcLocales
4−, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
5−, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
6−, telepathy-logger, libnotify, clutter, libsoup, gnutls
7−, evolution-data-server, yelp-xsl
8−, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info
9−, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas
10−, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
1+{ stdenv
2+, intltool
3+, fetchurl
4+, webkitgtk
5+, pkgconfig
6+, gtk3
7+, glib
8+, file
9+, librsvg
10+, gnome3
11+, gdk-pixbuf
12+, python3
13+, telepathy-glib
14+, telepathy-farstream
15+, glibcLocales
16+, clutter-gtk
17+, clutter-gst
18+, gst_all_1
19+, cogl
20+, gnome-online-accounts
21+, gcr
22+, libsecret
23+, folks
24+, libpulseaudio
25+, telepathy-mission-control
26+, telepathy-logger
27+, libnotify
28+, clutter
29+, libsoup
30+, gnutls
31+, evolution-data-server
32+, yelp-xsl
33+, libcanberra-gtk3
34+, p11-kit
35+, farstream
36+, libtool
37+, shared-mime-info
38+, wrapGAppsHook
39+, itstool
40+, libxml2
41+, libxslt
42+, icu
43+, libgee
44+, gsettings-desktop-schemas
45+, isocodes
46+, enchant
47+, libchamplain
48+, geoclue2
49+, geocode-glib
50+, cheese
51+, libgudev
52+}:
1153
1254stdenv.mkDerivation rec {
1355 pname = "empathy";
@@ -19,30 +61,72 @@ stdenv.mkDerivation rec {
1961 };
2062
2163 propagatedUserEnvPkgs = [
22− gnome-online-accounts shared-mime-info
64+ gnome-online-accounts
65+ shared-mime-info
2366 ];
67+
2468 propagatedBuildInputs = [
25− folks telepathy-logger evolution-data-server telepathy-mission-control
69+ folks
70+ telepathy-logger
71+ evolution-data-server
72+ telepathy-mission-control
2673 ];
74+
2775 nativeBuildInputs = [
28− pkgconfig libtool intltool itstool file wrapGAppsHook
29− libxml2 libxslt yelp-xsl python3 glibcLocales
76+ pkgconfig
77+ libtool
78+ intltool
79+ itstool
80+ file
81+ wrapGAppsHook
82+ libxml2
83+ libxslt
84+ yelp-xsl
85+ python3
86+ glibcLocales
3087 ];
88+
3189 buildInputs = [
32− gtk3 glib webkitgtk icu gnome-online-accounts
33− telepathy-glib clutter-gtk clutter-gst cogl
34− gst_all_1.gstreamer gst_all_1.gst-plugins-base
35− gcr libsecret libpulseaudio gdk-pixbuf
36− libnotify clutter libsoup gnutls libgee p11-kit
37− libcanberra-gtk3 telepathy-farstream farstream
38− gnome3.adwaita-icon-theme gsettings-desktop-schemas
90+ gtk3
91+ glib
92+ webkitgtk
93+ icu
94+ gnome-online-accounts
95+ telepathy-glib
96+ clutter-gtk
97+ clutter-gst
98+ cogl
99+ gst_all_1.gstreamer
100+ gst_all_1.gst-plugins-base
101+ gcr
102+ libsecret
103+ libpulseaudio
104+ gdk-pixbuf
105+ libnotify
106+ clutter
107+ libsoup
108+ gnutls
109+ libgee
110+ p11-kit
111+ libcanberra-gtk3
112+ telepathy-farstream
113+ farstream
114+ gnome3.adwaita-icon-theme
115+ gsettings-desktop-schemas
39116 librsvg
117+
40118 # Spell-checking
41− enchant isocodes
119+ enchant
120+ isocodes
121+
42122 # Display maps, location awareness, geocode support
43− libchamplain geoclue2 geocode-glib
123+ libchamplain
124+ geoclue2
125+ geocode-glib
126+
44127 # Cheese webcam support, camera monitoring
45− cheese libgudev
128+ cheese
129+ libgudev
46130 ];
47131
48132 enableParallelBuilding = true;