pyrox.dev
Merge pull request #28959 from jtojnar/fix/pomodoro-gnome3.24
gnome-pomodoro: Update for compatibility with GNOME 3.24
authored by Graham Christensen and committed by GitHub 0115dd35 53c70837
+18
-24
pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+18
-24
pkgs/desktops/gnome-3/misc/pomodoro/default.nix
···
1
-
{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper,
2
-
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
3
-
glib, gobjectIntrospection, telepathy_glib
1
+
{ stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook,
2
+
dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3,
3
+
glib, gobjectIntrospection, libpeas
4
4
}:
5
5
6
6
stdenv.mkDerivation rec {
7
-
version = "0.11.2";
7
+
version = "0.13.3";
8
8
name = "gnome-shell-pomodoro-${version}";
9
9
10
10
src = fetchFromGitHub {
11
-
owner = "codito";
12
-
repo = "gnome-pomodoro";
13
-
rev = "${version}";
14
-
sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l";
11
+
owner = "codito";
12
+
repo = "gnome-pomodoro";
13
+
rev = "${version}";
14
+
sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2";
15
15
};
16
16
17
-
configureScript = ''./autogen.sh'';
17
+
configureScript = "./autogen.sh";
18
+
19
+
nativeBuildInputs = [
20
+
autoconf-archive libtool intltool appstream-glib
21
+
wrapGAppsHook pkgconfig
22
+
];
18
23
19
24
buildInputs = [
20
-
which intltool glib gobjectIntrospection pkgconfig libtool
21
-
makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
25
+
glib gobjectIntrospection libpeas
26
+
dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer
22
27
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
23
-
gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
24
-
gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
28
+
gnome3.gsettings_desktop_schemas
29
+
gnome3.gnome_common gnome3.gnome_shell gtk3
25
30
gnome3.defaultIconTheme
26
31
];
27
-
28
-
preBuild = ''
29
-
sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
30
-
vapi/Makefile
31
-
'';
32
-
33
-
preFixup = ''
34
-
wrapProgram $out/bin/gnome-pomodoro \
35
-
--prefix XDG_DATA_DIRS : \
36
-
"$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
37
-
'';
38
32
39
33
meta = with stdenv.lib; {
40
34
homepage = https://github.com/codito/gnome-shell-pomodoro;