pyrox.dev
lol
malcontent: 0.11.0 → 0.11.1
https://gitlab.freedesktop.org/pwithnall/malcontent/-/compare/0.11.0...0.11.1
+16
-19
+13
-10
pkgs/development/libraries/malcontent/better-separation.patch
+13
-10
pkgs/development/libraries/malcontent/better-separation.patch
···
1
-
commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
1
+
commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5
2
2
Author: Jan Tojnar <jtojnar@gmail.com>
3
3
Date: Thu Jul 23 18:49:03 2020 +0200
4
4
···
22
22
https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
23
23
24
24
diff --git a/meson.build b/meson.build
25
-
index 6e1dfa5..196350b 100644
25
+
index 038dd35..e3c77f0 100644
26
26
--- a/meson.build
27
27
+++ b/meson.build
28
28
@@ -123,9 +123,8 @@ test_env = [
···
36
36
subdir('libmalcontent')
37
37
else
38
38
libmalcontent_api_version = '0'
39
-
@@ -136,11 +135,16 @@ endif
40
-
if get_option('ui').enabled()
39
+
@@ -143,14 +142,19 @@ if get_option('ui').enabled()
40
+
)
41
41
subdir('libmalcontent-ui')
42
42
endif
43
43
-subdir('malcontent-client')
···
47
47
if get_option('ui').enabled()
48
48
subdir('malcontent-control')
49
49
+ subdir('help')
50
-
+endif
50
+
51
+
gnome.post_install(
52
+
gtk_update_icon_cache: true,
53
+
update_desktop_database: true,
54
+
)
55
+
endif
56
+
-subdir('pam')
57
+
-subdir('po')
51
58
+if not get_option('use_system_libmalcontent')
52
59
+ subdir('pam')
53
60
+ subdir('po')
54
-
endif
55
-
-subdir('pam')
56
-
-subdir('po')
57
-
58
-
meson.add_install_script('build-aux/meson_post_install.py')
61
+
+endif
+3
-3
pkgs/development/libraries/malcontent/default.nix
+3
-3
pkgs/development/libraries/malcontent/default.nix
···
19
19
20
20
stdenv.mkDerivation rec {
21
21
pname = "malcontent";
22
-
version = "0.11.0";
22
+
version = "0.11.1";
23
23
24
24
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
25
25
26
26
src = fetchFromGitLab {
27
27
domain = "gitlab.freedesktop.org";
28
28
owner = "pwithnall";
29
-
repo = pname;
29
+
repo = "malcontent";
30
30
rev = version;
31
-
sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
31
+
hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
32
32
};
33
33
34
34
patches = [
-6
pkgs/development/libraries/malcontent/ui.nix
-6
pkgs/development/libraries/malcontent/ui.nix
···
66
66
"-Dui=enabled"
67
67
];
68
68
69
-
postPatch = ''
70
-
# https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
71
-
substituteInPlace build-aux/meson_post_install.py \
72
-
--replace gtk-update-icon-cache gtk4-update-icon-cache
73
-
'';
74
-
75
69
meta = with lib; {
76
70
description = "UI components for parental controls library";
77
71
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";