Merge pull request #28959 from jtojnar/fix/pomodoro-gnome3.24

gnome-pomodoro: Update for compatibility with GNOME 3.24
This commit is contained in:
Graham Christensen 2017-10-05 19:35:16 -04:00 committed by GitHub
commit 0115dd351b

View File

@ -1,40 +1,34 @@
{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper,
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
glib, gobjectIntrospection, telepathy_glib
{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3,
glib, gobjectIntrospection, libpeas
}:
stdenv.mkDerivation rec {
version = "0.11.2";
version = "0.13.3";
name = "gnome-shell-pomodoro-${version}";
src = fetchFromGitHub {
owner = "codito";
repo = "gnome-pomodoro";
rev = "${version}";
sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
owner = "codito";
repo = "gnome-pomodoro";
rev = "${version}";
sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2";
};
configureScript = ''./autogen.sh'';
configureScript = "./autogen.sh";
buildInputs = [
which intltool glib gobjectIntrospection pkgconfig libtool
makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 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 gtk3 telepathy_glib
gnome3.defaultIconTheme
nativeBuildInputs = [
autoconf-archive libtool intltool appstream-glib
wrapGAppsHook pkgconfig
];
preBuild = ''
sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
vapi/Makefile
'';
preFixup = ''
wrapProgram $out/bin/gnome-pomodoro \
--prefix XDG_DATA_DIRS : \
"$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
'';
buildInputs = [
glib gobjectIntrospection libpeas
dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gnome3.gsettings_desktop_schemas
gnome3.gnome_common gnome3.gnome_shell gtk3
gnome3.defaultIconTheme
];
meta = with stdenv.lib; {
homepage = https://github.com/codito/gnome-shell-pomodoro;