From 18879293e2b7550671bd3eaac9fcc8b24f44e323 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Tue, 27 Jan 2026 10:30:27 -0800 Subject: [PATCH] barlow: use installFonts hook --- pkgs/by-name/ba/barlow/package.nix | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ba/barlow/package.nix b/pkgs/by-name/ba/barlow/package.nix index dc0b0439c40f..65662de4b279 100644 --- a/pkgs/by-name/ba/barlow/package.nix +++ b/pkgs/by-name/ba/barlow/package.nix @@ -2,30 +2,26 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "barlow"; version = "1.422"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "jpt"; repo = "barlow"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY="; }; - installPhase = '' - runHook preInstall - - install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype - install -Dm644 fonts/ttf/*.ttf fonts/gx/*.ttf -t $out/share/fonts/truetype - install -Dm644 fonts/eot/*.eot -t $out/share/fonts/eot - install -Dm644 fonts/woff/*.woff -t $out/share/fonts/woff - install -Dm644 fonts/woff2/*.woff2 -t $out/share/fonts/woff2 - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Grotesk variable font superfamily"; @@ -34,4 +30,4 @@ stdenvNoCC.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +})