pyrox.dev
Merge pull request #8243 from geerds/pomodoro
gnome-pomodoro: Fix build for 3.16
+11
-12
pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
+11
-12
pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
···
1
1
{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
2
-
dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base,
3
-
glib, gobjectIntrospection, hicolor_icon_theme
2
+
dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
3
+
glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
4
4
}:
5
5
6
6
stdenv.mkDerivation rec {
7
-
rev = "0.10.3";
8
-
name = "gnome-shell-pomodoro-${rev}-61df3fa";
7
+
rev = "624945d";
8
+
name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "codito";
12
-
repo = "gnome-shell-pomodoro";
12
+
repo = "gnome-pomodoro";
13
13
rev = "${rev}";
14
-
sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
14
+
sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
15
15
};
16
16
17
17
configureScript = ''./autogen.sh'';
18
18
19
19
buildInputs = [
20
20
which automake113x intltool glib gobjectIntrospection pkgconfig libtool
21
-
makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
21
+
makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
22
22
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
23
23
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
24
24
gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
25
+
telepathy_glib
25
26
];
26
27
27
28
preBuild = ''
28
-
sed -i \
29
-
-e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
30
-
-e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \
31
-
vapi/Makefile
29
+
sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
30
+
vapi/Makefile
32
31
'';
33
32
34
33
preFixup = ''
···
42
41
description =
43
42
"Personal information management application that provides integrated " +
44
43
"mail, calendaring and address book functionality";
45
-
maintainers = with maintainers; [ DamienCassou ];
44
+
maintainers = with maintainers; [ DamienCassou jgeerds ];
46
45
license = licenses.gpl3;
47
46
platforms = platforms.linux;
48
47
};