Unverified Commit c8c617e4 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #280939 from arthsmn/plymouth 

plymouth: 23.360.11 -> 24.004.60
parents 7f91c8ef 9e817011

pkgs/os-specific/linux/plymouth/default.nix

+9 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/os-specific/linux/plymouth/fix-paths.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
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;