From 6eef837e3970c7935c177dcd8d92888f4b4f68d2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:48:13 +0000 Subject: [PATCH] andika: use finalAttrs, update URL/doc paths, fully qualify lib attrs in meta Switch to finalAttrs form, reference finalAttrs.version in URL and doc install path, and replace broad `with lib;` with explicit lib-qualified attributes. --- pkgs/by-name/an/andika/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/andika/package.nix b/pkgs/by-name/an/andika/package.nix index 481426a3d502..b71bafa3408d 100644 --- a/pkgs/by-name/an/andika/package.nix +++ b/pkgs/by-name/an/andika/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "andika"; version = "7.000"; src = fetchzip { - url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + url = "https://software.sil.org/downloads/r/andika/Andika-${finalAttrs.version}.zip"; hash = "sha256-46kbzFxNEpSuqyUwpScnxxgZi1dJlwK+AUkdULcinok="; }; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/andika-${finalAttrs.version} runHook postInstall ''; @@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.f--t ]; }; -} +})