Merge pull request #8243 from geerds/pomodoro

gnome-pomodoro: Fix build for 3.16
This commit is contained in:
Damien Cassou 2015-06-09 18:14:37 +02:00
commit 972ad2437a

View File

@ -1,34 +1,33 @@
{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base,
glib, gobjectIntrospection, hicolor_icon_theme
dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
}:
stdenv.mkDerivation rec {
rev = "0.10.3";
name = "gnome-shell-pomodoro-${rev}-61df3fa";
rev = "624945d";
name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-shell-pomodoro";
repo = "gnome-pomodoro";
rev = "${rev}";
sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
};
configureScript = ''./autogen.sh'';
buildInputs = [
which automake113x intltool glib gobjectIntrospection pkgconfig libtool
makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
telepathy_glib
];
preBuild = ''
sed -i \
-e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
-e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \
vapi/Makefile
sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
vapi/Makefile
'';
preFixup = ''
@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
description =
"Personal information management application that provides integrated " +
"mail, calendaring and address book functionality";
maintainers = with maintainers; [ DamienCassou ];
maintainers = with maintainers; [ DamienCassou jgeerds ];
license = licenses.gpl3;
platforms = platforms.linux;
};