pyrox.dev
Merge pull request #280939 from arthsmn/plymouth
plymouth: 23.360.11 -> 24.004.60
+9
-2
pkgs/os-specific/linux/plymouth/default.nix
+9
-2
pkgs/os-specific/linux/plymouth/default.nix
···
2
2
, stdenv
3
3
, fetchFromGitLab
4
4
, writeText
5
+
, substituteAll
5
6
, meson
6
7
, pkg-config
7
8
, ninja
···
16
17
, pango
17
18
, systemd
18
19
, xorg
20
+
, fontconfig
19
21
}:
20
22
21
23
stdenv.mkDerivation (finalAttrs: {
22
24
pname = "plymouth";
23
-
version = "23.360.11";
25
+
version = "24.004.60";
24
26
25
27
outputs = [ "out" "dev" ];
26
28
···
29
31
owner = "plymouth";
30
32
repo = "plymouth";
31
33
rev = finalAttrs.version;
32
-
hash = "sha256-Uun4KtrbkFCiGq3WpZlZ8NKKCOnM+jcgYa8qoqAYdaw=";
34
+
hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM=";
33
35
};
34
36
35
37
patches = [
···
37
39
./dont-create-broken-symlink.patch
38
40
# add support for loading plugins from /run to assist NixOS module
39
41
./add-runtime-plugin-path.patch
42
+
# fix FHS hardcoded paths
43
+
(substituteAll {
44
+
src = ./fix-paths.patch;
45
+
fcmatch = "${fontconfig}/bin/fc-match";
46
+
})
40
47
];
41
48
42
49
strictDeps = true;
+21
pkgs/os-specific/linux/plymouth/fix-paths.patch
+21
pkgs/os-specific/linux/plymouth/fix-paths.patch
···
1
+
diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
2
+
index 917b04c0..83f2bec2 100644
3
+
--- a/src/plugins/controls/label-freetype/plugin.c
4
+
+++ b/src/plugins/controls/label-freetype/plugin.c
5
+
@@ -127,7 +127,7 @@ find_default_font_path (void)
6
+
FILE *fp;
7
+
static char fc_match_out[PATH_MAX];
8
+
9
+
- fp = popen ("/usr/bin/fc-match -f %{file}", "r");
10
+
+ fp = popen ("@fcmatch@ -f %{file}", "r");
11
+
if (!fp)
12
+
return FONT_FALLBACK;
13
+
14
+
@@ -144,7 +144,7 @@ find_default_monospace_font_path (void)
15
+
FILE *fp;
16
+
static char fc_match_out[PATH_MAX];
17
+
18
+
- fp = popen ("/usr/bin/fc-match -f %{file} monospace", "r");
19
+
+ fp = popen ("@fcmatch@ -f %{file} monospace", "r");
20
+
if (!fp)
21
+
return MONOSPACE_FONT_FALLBACK;