From 8e3dce14145ccfd01cb6455c2267a6d26de2c9ca Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Mon, 2 Mar 2026 16:01:36 -0800 Subject: [PATCH] ubuntu-classic: use installFonts hook --- pkgs/by-name/ph/phira-free/package.nix | 2 +- pkgs/by-name/ub/ubuntu-classic/package.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ph/phira-free/package.nix b/pkgs/by-name/ph/phira-free/package.nix index 3cc205396a2e..f0fa9687cbcd 100644 --- a/pkgs/by-name/ph/phira-free/package.nix +++ b/pkgs/by-name/ph/phira-free/package.nix @@ -24,7 +24,7 @@ phira.override { chmod -R +w $out/assets magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg - cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf + cp ${ubuntu-classic}/share/fonts/truetype/Ubuntu-R.ttf $out/assets/font.ttf runHook postInstall ''; diff --git a/pkgs/by-name/ub/ubuntu-classic/package.nix b/pkgs/by-name/ub/ubuntu-classic/package.nix index 7752660ac3b7..4dda1ad60215 100644 --- a/pkgs/by-name/ub/ubuntu-classic/package.nix +++ b/pkgs/by-name/ub/ubuntu-classic/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchgit, gitUpdater, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -15,12 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-GrpBVgisVu7NklFYqkEqYi0hui/pCHlsM3Ky4mEUq90="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -m444 -Dt $out/share/fonts/truetype/ubuntu *.ttf - - runHook postInstall + # Hinting sources such as sources/VTT/Ubuntu-B-hinting.ttf are not fonts to install + preInstall = '' + rm -r sources ''; passthru.updateScript = gitUpdater { rev-prefix = "import/"; };