From aad2baae4adf8453eff5b980e16ec17ebd2901a5 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 08:54:20 -0400 Subject: [PATCH 1/2] takao: use installFonts hook --- pkgs/by-name/ta/takao/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/takao/package.nix b/pkgs/by-name/ta/takao/package.nix index 58f9b29720bb..01e43d756acb 100644 --- a/pkgs/by-name/ta/takao/package.nix +++ b/pkgs/by-name/ta/takao/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Japanese TrueType Gothic, P Gothic, Mincho, P Mincho fonts"; From dfdde586a628263afa2512ef35c9d4b3689bf64f Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:01:36 -0400 Subject: [PATCH 2/2] takao: switch to finalAttrs --- pkgs/by-name/ta/takao/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/takao/package.nix b/pkgs/by-name/ta/takao/package.nix index 01e43d756acb..80ea2828316a 100644 --- a/pkgs/by-name/ta/takao/package.nix +++ b/pkgs/by-name/ta/takao/package.nix @@ -5,12 +5,12 @@ installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "takao"; version = "00303.01"; src = fetchurl { - url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; + url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; }; @@ -23,4 +23,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ serge ]; platforms = lib.platforms.all; }; -} +})