From 69e70dcb52d1f99ff735330101f03c2ab9dd24a9 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Wed, 4 Mar 2026 20:16:10 -0800 Subject: [PATCH] fira-sans: use installFonts --- pkgs/by-name/fi/fira-sans/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fi/fira-sans/package.nix b/pkgs/by-name/fi/fira-sans/package.nix index 4dd3a09ccb74..c7ef979a1716 100644 --- a/pkgs/by-name/fi/fira-sans/package.nix +++ b/pkgs/by-name/fi/fira-sans/package.nix @@ -2,27 +2,26 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fira-sans"; version = "4.301"; + outputs = [ + "out" + "webfont" + ]; src = fetchzip { url = "https://carrois.com/downloads/Fira/Download_Folder_FiraSans_${ - lib.replaceStrings [ "." ] [ "" ] version + lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }.zip"; hash = "sha256-WBt3oqPK7ACqMhilYkyFx9Ek2ugwdCDFZN+8HLRnGRs"; stripRoot = false; }; - installPhase = '' - runHook preInstall - - install --mode=644 -Dt $out/share/fonts/opentype Download_Folder_FiraSans*/Fonts/Fira_Sans_OTF*/*/*/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://carrois.com/fira/"; @@ -36,7 +35,8 @@ stdenvNoCC.mkDerivation rec { Medium, Semi Bold, Bold, Extra Bold, Heavy weights with corresponding italic versions. ''; + maintainers = with lib.maintainers; [ pancaek ]; license = lib.licenses.ofl; platforms = lib.platforms.all; }; -} +})