From 2cbdcc0dc4cc9295a4b63c76853e387261e6685c Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 4 Mar 2026 20:14:10 -0800 Subject: [PATCH] fira-go: use installFonts --- pkgs/by-name/fi/fira-go/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fi/fira-go/package.nix b/pkgs/by-name/fi/fira-go/package.nix index 669601ea3206..5c6e9e3957d3 100644 --- a/pkgs/by-name/fi/fira-go/package.nix +++ b/pkgs/by-name/fi/fira-go/package.nix @@ -2,27 +2,27 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fira-go"; version = "1.001"; + outputs = [ + "out" + "webfont" + ]; + src = fetchzip { url = "https://carrois.com/downloads/FiraGO/Download_Folder_FiraGO_${ - lib.replaceStrings [ "." ] [ "" ] version + lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }.zip"; hash = "sha256-+lw4dh7G/Xv3pzGXdMUl9xNc2Nk7wUOAh+lq3K1LrXs="; stripRoot = false; }; - installPhase = '' - runHook preInstall - - install --mode=644 -Dt $out/share/fonts/opentype Download_Folder_FiraGO*/Fonts/FiraGO_OTF*/*/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://carrois.com/fira/"; @@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec { maintainers = [ lib.maintainers.loicreynier ]; platforms = lib.platforms.all; }; -} +})