pyrox.dev
Merge pull request #141834 from bobby285271/notejot
notejot: 3.1.5 -> 3.2.0
+18
-14
pkgs/applications/misc/notejot/default.nix
+18
-14
pkgs/applications/misc/notejot/default.nix
···
2
2
, stdenv
3
3
, fetchFromGitHub
4
4
, gtk4
5
-
, gtksourceview
5
+
, hicolor-icon-theme
6
6
, json-glib
7
7
, libadwaita
8
8
, libgee
9
9
, meson
10
10
, ninja
11
11
, nix-update-script
12
-
, pantheon
13
12
, pkg-config
14
13
, python3
15
14
, vala
16
-
, wrapGAppsHook
15
+
, wrapGAppsHook4
17
16
}:
18
17
19
18
stdenv.mkDerivation rec {
20
19
pname = "notejot";
21
-
version = "3.1.5";
20
+
version = "3.2.0";
22
21
23
22
src = fetchFromGitHub {
24
23
owner = "lainsce";
25
24
repo = pname;
26
25
rev = version;
27
-
hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M=";
26
+
hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU=";
28
27
};
29
28
29
+
patches = [
30
+
# build: use gtk4-update-icon-cache
31
+
# https://github.com/lainsce/notejot/pull/307
32
+
./use-gtk4-update-icon-cache.patch
33
+
];
34
+
30
35
nativeBuildInputs = [
31
36
meson
32
37
ninja
33
-
vala
34
38
pkg-config
35
39
python3
36
-
wrapGAppsHook
40
+
vala
41
+
wrapGAppsHook4
37
42
];
43
+
38
44
buildInputs = [
39
45
gtk4
40
-
gtksourceview
46
+
hicolor-icon-theme
41
47
json-glib
42
48
libadwaita
43
49
libgee
44
-
pantheon.elementary-icon-theme
45
-
pantheon.granite
46
50
];
47
51
48
52
postPatch = ''
···
50
54
patchShebangs build-aux/post_install.py
51
55
'';
52
56
57
+
passthru.updateScript = nix-update-script {
58
+
attrPath = pname;
59
+
};
60
+
53
61
meta = with lib; {
54
62
homepage = "https://github.com/lainsce/notejot";
55
63
description = "Stupidly-simple sticky notes applet";
56
64
license = licenses.gpl3Plus;
57
65
maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
58
66
platforms = platforms.linux;
59
-
};
60
-
61
-
passthru.updateScript = nix-update-script {
62
-
attrPath = pname;
63
67
};
64
68
}
+20
pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch
+20
pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch
···
1
+
diff --git a/build-aux/post_install.py b/build-aux/post_install.py
2
+
index 1278304..fface6d 100644
3
+
--- a/build-aux/post_install.py
4
+
+++ b/build-aux/post_install.py
5
+
@@ -2,11 +2,13 @@
6
+
import os
7
+
import subprocess
8
+
9
+
-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
10
+
+install_prefix = os.environ['MESON_INSTALL_PREFIX']
11
+
+icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor')
12
+
+schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
13
+
14
+
if not os.environ.get('DESTDIR'):
15
+
print('Compiling gsettings schemas…')
16
+
subprocess.call(['glib-compile-schemas', schemadir], shell=False)
17
+
18
+
print('Rebuilding desktop icons cache...')
19
+
- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False)
20
+
+ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False)