Skip to content

Commit

Permalink
plymouth: 23.360.11 -> 24.004.60
Browse files Browse the repository at this point in the history
  • Loading branch information
arthsmn committed Jan 14, 2024
1 parent 3d673c9 commit 9e81701
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkgs/os-specific/linux/plymouth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, fetchFromGitLab
, writeText
, substituteAll
, meson
, pkg-config
, ninja
Expand All @@ -16,11 +17,12 @@
, pango
, systemd
, xorg
, fontconfig
}:

stdenv.mkDerivation (finalAttrs: {
pname = "plymouth";
version = "23.360.11";
version = "24.004.60";

outputs = [ "out" "dev" ];

Expand All @@ -29,14 +31,19 @@ stdenv.mkDerivation (finalAttrs: {
owner = "plymouth";
repo = "plymouth";
rev = finalAttrs.version;
hash = "sha256-Uun4KtrbkFCiGq3WpZlZ8NKKCOnM+jcgYa8qoqAYdaw=";
hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM=";
};

patches = [
# do not create unnecessary symlink to non-existent header-image.png
./dont-create-broken-symlink.patch
# add support for loading plugins from /run to assist NixOS module
./add-runtime-plugin-path.patch
# fix FHS hardcoded paths
(substituteAll {
src = ./fix-paths.patch;
fcmatch = "${fontconfig}/bin/fc-match";
})
];

strictDeps = true;
Expand Down
21 changes: 21 additions & 0 deletions pkgs/os-specific/linux/plymouth/fix-paths.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
index 917b04c0..83f2bec2 100644
--- a/src/plugins/controls/label-freetype/plugin.c
+++ b/src/plugins/controls/label-freetype/plugin.c
@@ -127,7 +127,7 @@ find_default_font_path (void)
FILE *fp;
static char fc_match_out[PATH_MAX];

- fp = popen ("/usr/bin/fc-match -f %{file}", "r");
+ fp = popen ("@fcmatch@ -f %{file}", "r");
if (!fp)
return FONT_FALLBACK;

@@ -144,7 +144,7 @@ find_default_monospace_font_path (void)
FILE *fp;
static char fc_match_out[PATH_MAX];

- fp = popen ("/usr/bin/fc-match -f %{file} monospace", "r");
+ fp = popen ("@fcmatch@ -f %{file} monospace", "r");
if (!fp)
return MONOSPACE_FONT_FALLBACK;

0 comments on commit 9e81701

Please sign in to comment.