pyrox.dev
Merge pull request #141780 from jtojnar/pomodoro
gnome.pomodoro: 0.19.1 → 0.20.0
authored by
Jan Tojnar
and committed by
GitHub
fe49c16a
e90bc337
+29
-14
pkgs/desktops/gnome/misc/pomodoro/default.nix
+29
-14
pkgs/desktops/gnome/misc/pomodoro/default.nix
···
1
-
{ lib, stdenv
1
+
{ lib
2
+
, stdenv
2
3
, fetchFromGitHub
3
-
, autoconf-archive
4
-
, appstream-glib
4
+
, substituteAll
5
+
, fetchpatch
6
+
, meson
7
+
, ninja
5
8
, pkg-config
6
9
, wrapGAppsHook
10
+
, desktop-file-utils
7
11
, libcanberra
8
12
, gst_all_1
9
13
, vala
···
11
15
, gom
12
16
, sqlite
13
17
, libxml2
14
-
, autoreconfHook
15
18
, glib
16
19
, gobject-introspection
17
20
, libpeas
18
-
, gnome-shell
19
21
, gsettings-desktop-schemas
20
-
, adwaita-icon-theme
21
22
, gettext
22
23
}:
23
24
24
25
stdenv.mkDerivation rec {
25
26
pname = "gnome-shell-pomodoro";
26
-
version = "0.19.1";
27
+
version = "0.20.0";
27
28
28
29
src = fetchFromGitHub {
29
-
owner = "codito";
30
+
owner = "gnome-pomodoro";
30
31
repo = "gnome-pomodoro";
31
32
rev = version;
32
-
sha256 = "sha256-im66QUzz6PcX0vkf4cN57ttRLB4KKPFky1pwUa4V7kQ=";
33
+
sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic=";
33
34
};
34
35
36
+
patches = [
37
+
# Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts.
38
+
# We need to patch the build script so that the extension can find them.
39
+
(substituteAll {
40
+
src = ./fix-schema-path.patch;
41
+
inherit pname version;
42
+
})
43
+
44
+
# Fix error reporting code.
45
+
# https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591
46
+
(fetchpatch {
47
+
url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch";
48
+
sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc=";
49
+
})
50
+
];
51
+
35
52
nativeBuildInputs = [
36
-
appstream-glib
37
-
autoconf-archive
38
-
autoreconfHook
53
+
meson
54
+
ninja
39
55
gettext
40
56
gobject-introspection
41
57
libxml2
42
58
pkg-config
43
59
vala
44
60
wrapGAppsHook
61
+
desktop-file-utils
45
62
];
46
63
47
64
buildInputs = [
48
-
adwaita-icon-theme
49
65
glib
50
-
gnome-shell
51
66
gom
52
67
gsettings-desktop-schemas
53
68
gst_all_1.gst-plugins-base
+40
pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch
+40
pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch
···
1
+
diff --git a/data/meson.build b/data/meson.build
2
+
index 5e4ce69..982b3c9 100644
3
+
--- a/data/meson.build
4
+
+++ b/data/meson.build
5
+
@@ -31,7 +31,7 @@ i18n.merge_file(
6
+
7
+
install_data(
8
+
'org.gnome.pomodoro.gschema.xml',
9
+
- install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',
10
+
+ install_dir: gschema_dir,
11
+
)
12
+
13
+
subdir('icons')
14
+
diff --git a/meson-post-install.sh b/meson-post-install.sh
15
+
index bf4013a..c87fba4 100644
16
+
--- a/meson-post-install.sh
17
+
+++ b/meson-post-install.sh
18
+
@@ -7,7 +7,7 @@ datadir="${prefix}/$1"
19
+
# want/need us to do the below
20
+
if [ -z "${DESTDIR}" ]; then
21
+
echo "Compiling GSchema..."
22
+
- glib-compile-schemas "${datadir}/glib-2.0/schemas"
23
+
+ glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas"
24
+
25
+
echo "Updating icon cache..."
26
+
gtk-update-icon-cache -f -t "${datadir}/icons/hicolor"
27
+
diff --git a/meson.build b/meson.build
28
+
index 09857a1..a07d27c 100644
29
+
--- a/meson.build
30
+
+++ b/meson.build
31
+
@@ -40,7 +40,8 @@ add_project_arguments(
32
+
)
33
+
34
+
# We are going to use these variables later on for the plugins
35
+
-gschema_dir = get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
36
+
+nix_package_name = '@pname@' + '-' + '@version@'
37
+
+gschema_dir = get_option('prefix') / get_option('datadir') / 'gsettings-schemas' / nix_package_name / 'glib-2.0' / 'schemas'
38
+
plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins'
39
+
extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in'
40
+