From cc553ea0af04ed7705a4ee424b9ad8d6ce6e262b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 2 Mar 2026 22:21:45 +0800 Subject: [PATCH 1/4] mpvScripts.modernx-zydezu: use installFonts --- pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix index d0ac93c53d24..a89341386037 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + installFonts, makeFontsConf, nix-update-script, }: @@ -17,10 +18,8 @@ buildLua (finalAttrs: { hash = "sha256-a+StfEYQwt5NuELvanvZllrD2RQ0g9JBpCznMdSDM5Y="; }; - postInstall = '' - mkdir -p $out/share/fonts - cp -r *.ttf $out/share/fonts - ''; + nativeBuildInputs = [ installFonts ]; + passthru.extraWrapperArgs = [ "--set" "FONTCONFIG_FILE" From fbd521e5e0ae8b62990b6a4dcc8163a9ef5062c0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 2 Mar 2026 22:21:51 +0800 Subject: [PATCH 2/4] mpvScripts.modernx: use installFonts --- pkgs/by-name/mp/mpv/scripts/modernx.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mp/mpv/scripts/modernx.nix b/pkgs/by-name/mp/mpv/scripts/modernx.nix index a5ae4e7b3c6f..886ba96a437f 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernx.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernx.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + installFonts, makeFontsConf, nix-update-script, }: @@ -17,10 +18,8 @@ buildLua (finalAttrs: { hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k="; }; - postInstall = '' - mkdir -p $out/share/fonts - cp -r *.ttf $out/share/fonts - ''; + nativeBuildInputs = [ installFonts ]; + passthru.extraWrapperArgs = [ "--set" "FONTCONFIG_FILE" From 5fa0ff192acb6768a4b39d825465bbd515865b48 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 2 Mar 2026 22:21:58 +0800 Subject: [PATCH 3/4] mpvScripts.modernz: use installFonts --- pkgs/by-name/mp/mpv/scripts/modernz.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpv/scripts/modernz.nix b/pkgs/by-name/mp/mpv/scripts/modernz.nix index 17b0700286fd..ac8ac744fa0a 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernz.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernz.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + installFonts, makeFontsConf, nix-update-script, }: @@ -17,9 +18,7 @@ buildLua (finalAttrs: { hash = "sha256-9jth8TCAx/cmbAfO8s+1WPpMDuF79gQtVlC4OG2adrA="; }; - postInstall = '' - install -Dt $out/share/fonts *.ttf - ''; + nativeBuildInputs = [ installFonts ]; passthru.extraWrapperArgs = [ "--set" From 7448ad53b837465cf4e476bfc1c5b906bd00af62 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 2 Mar 2026 22:41:00 +0800 Subject: [PATCH 4/4] mpvScripts.mpv-osc-modern: use installFonts --- pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix b/pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix index 89231e405a1f..f9dba8fe9808 100644 --- a/pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix +++ b/pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + installFonts, makeFontsConf, nix-update-script, }: @@ -17,10 +18,8 @@ buildLua (finalAttrs: { hash = "sha256-RMUy8UpSRSCEPAbnGLpJ2NjDsDdkjq8cNsdGwsQ5ANU="; }; - postInstall = '' - mkdir -p $out/share/fonts - cp -r *.ttf $out/share/fonts - ''; + nativeBuildInputs = [ installFonts ]; + passthru.extraWrapperArgs = [ "--set" "FONTCONFIG_FILE"