diff options
| author | K900 <me@0upti.me> | 2024-01-16 22:46:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 22:46:24 +0300 |
| commit | c8c617e4735953976ec0048745894ceea090e2b2 (patch) | |
| tree | f434c1a517356b366ae3db182d2793af4caaa3f5 | |
| parent | 7f91c8ef837826e1773d50df904bb328706df3eb (diff) | |
| parent | 9e817011deed363d92ad3f21e9604a6501011ced (diff) | |
Merge pull request #280939 from arthsmn/plymouth
plymouth: 23.360.11 -> 24.004.60
| -rw-r--r-- | pkgs/os-specific/linux/plymouth/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/plymouth/fix-paths.patch | 21 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 90f400defc2da..02245a1086116 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , writeText +, substituteAll , meson , pkg-config , ninja @@ -16,11 +17,12 @@ , pango , systemd , xorg +, fontconfig }: stdenv.mkDerivation (finalAttrs: { pname = "plymouth"; - version = "23.360.11"; + version = "24.004.60"; outputs = [ "out" "dev" ]; @@ -29,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "plymouth"; repo = "plymouth"; rev = finalAttrs.version; - hash = "sha256-Uun4KtrbkFCiGq3WpZlZ8NKKCOnM+jcgYa8qoqAYdaw="; + hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM="; }; patches = [ @@ -37,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: { ./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; diff --git a/pkgs/os-specific/linux/plymouth/fix-paths.patch b/pkgs/os-specific/linux/plymouth/fix-paths.patch new file mode 100644 index 0000000000000..5f930403f8ace --- /dev/null +++ b/pkgs/os-specific/linux/plymouth/fix-paths.patch @@ -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; |