git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #72133 from jtojnar/t-m-c

telepathy-mission-control: 5.16.4 → 5.16.5

commita51ea52f5a9fb02d1a4e185006a376fafbe19128 authorworldofpeace <worldofpeace@protonmail.ch> dateThu 31 Oct 2019, 15:02 (7 years ago) parent8a75eaaf3f7384
2 files changed+139−34
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+29−7 pkgs/desktops/gnome-3/core/empathy/default.nix+110−27
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+29−7
@@ -1,22 +1,44 @@
1−{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }:
1+{ stdenv
2+, fetchurl
3+, pkgconfig
4+, gnome3
5+, telepathy-glib
6+, python3
7+, libxslt
8+, makeWrapper
9+}:
210
311stdenv.mkDerivation rec {
4− name = "${pname}-5.16.4";
512 pname = "telepathy-mission-control";
13+ version = "5.16.5";
14+
15+ outputs = [ "out" "lib" "dev" ];
616
717 src = fetchurl {
8− url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
9− sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
18+ url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
19+ sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc";
1020 };
1121
12− buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing
22+ buildInputs = [
23+ python3
24+ ]; # ToDo: optional stuff missing
25+
26+ nativeBuildInputs = [
27+ pkgconfig
28+ libxslt
29+ makeWrapper
30+ ];
1331
14− nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];
32+ propagatedBuildInputs = [
33+ telepathy-glib
34+ ];
1535
1636 doCheck = true;
1737
38+ enableParallelBuilding = true;
39+
1840 preFixup = ''
19− wrapProgram "$out/libexec/mission-control-5" \
41+ wrapProgram "$lib/libexec/mission-control-5" \
2042 --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
2143 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
2244 '';
pkgs/desktops/gnome-3/core/empathy/default.nix+110−27
@@ -1,13 +1,54 @@
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+, clutter-gtk
16+, clutter-gst
17+, gst_all_1
18+, cogl
19+, gnome-online-accounts
20+, gcr
21+, libsecret
22+, folks
23+, libpulseaudio
24+, telepathy-mission-control
25+, telepathy-logger
26+, libnotify
27+, clutter
28+, libsoup
29+, gnutls
30+, evolution-data-server
31+, yelp-xsl
32+, libcanberra-gtk3
33+, p11-kit
34+, farstream
35+, libtool
36+, shared-mime-info
37+, wrapGAppsHook
38+, itstool
39+, libxml2
40+, libxslt
41+, icu
42+, libgee
43+, gsettings-desktop-schemas
44+, isocodes
45+, enchant
46+, libchamplain
47+, geoclue2
48+, geocode-glib
49+, cheese
50+, libgudev
51+}:
1152
1253stdenv.mkDerivation rec {
1354 pname = "empathy";
@@ -18,34 +59,76 @@ stdenv.mkDerivation rec {
1859 sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
1960 };
2061
21− propagatedUserEnvPkgs = [
22− gnome-online-accounts shared-mime-info
23− ];
2462 propagatedBuildInputs = [
25− folks telepathy-logger evolution-data-server telepathy-mission-control
63+ folks
64+ telepathy-logger
65+ evolution-data-server
66+ telepathy-mission-control
2667 ];
68+
2769 nativeBuildInputs = [
28− pkgconfig libtool intltool itstool file wrapGAppsHook
29− libxml2 libxslt yelp-xsl python3 glibcLocales
70+ pkgconfig
71+ libtool
72+ intltool
73+ itstool
74+ file
75+ wrapGAppsHook
76+ libxml2
77+ libxslt
78+ yelp-xsl
79+ python3
3080 ];
81+
3182 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
83+ gtk3
84+ glib
85+ webkitgtk
86+ icu
87+ gnome-online-accounts
88+ telepathy-glib
89+ clutter-gtk
90+ clutter-gst
91+ cogl
92+ gst_all_1.gstreamer
93+ gst_all_1.gst-plugins-base
94+ gcr
95+ libsecret
96+ libpulseaudio
97+ gdk-pixbuf
98+ libnotify
99+ clutter
100+ libsoup
101+ gnutls
102+ libgee
103+ p11-kit
104+ libcanberra-gtk3
105+ telepathy-farstream
106+ farstream
107+ gnome3.adwaita-icon-theme
108+ gsettings-desktop-schemas
39109 librsvg
110+
40111 # Spell-checking
41− enchant isocodes
112+ enchant
113+ isocodes
114+
42115 # Display maps, location awareness, geocode support
43− libchamplain geoclue2 geocode-glib
116+ libchamplain
117+ geoclue2
118+ geocode-glib
119+
44120 # Cheese webcam support, camera monitoring
45− cheese libgudev
121+ cheese
122+ libgudev
46123 ];
47124
48− LC_ALL = "en_US.UTF-8";
125+ enableParallelBuilding = true;
126+
127+ preFixup = ''
128+ gappsWrapperArgs+=(
129+ --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
130+ )
131+ '';
49132
50133 passthru = {
51134 updateScript = gnome3.updateScript {