From de800ded1dac39ee845dff643368be1702c0cfcc Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 4 Mar 2026 20:22:35 -0800 Subject: [PATCH] fira-code: use installFonts --- pkgs/by-name/fi/fira-code/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fi/fira-code/package.nix b/pkgs/by-name/fi/fira-code/package.nix index f1f42f07d3ff..dd072ea72bc6 100644 --- a/pkgs/by-name/fi/fira-code/package.nix +++ b/pkgs/by-name/fi/fira-code/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, useVariableFont ? true, }: @@ -16,15 +17,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; # only extract the variable font because everything else is a duplicate - installPhase = '' - runHook preInstall + preInstall = "cd ${lib.optionalString useVariableFont "variable_"}ttf"; - install -Dm644 -t $out/share/fonts/truetype ${ - if useVariableFont then "variable_ttf/*-VF.ttf" else "ttf/*.ttf" - } - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/tonsky/FiraCode";